[Libreoffice-commits] core.git: vcl/unx

[Caolán McNamara]

 vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit a57309fec223ef62a929807d078baafb0057005e
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Apr 25 20:12:00 2015 +0100

    gtk3: honour the control region height if it is larger
    
    Change-Id: I99a5a597dbc14521b27f9149411199d23b907c1e

diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index 77dfa59..97c7929 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -1084,6 +1084,8 @@ bool GtkSalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPar
 
         gint nWidgetHeight = nTextHeight + padding.top + padding.bottom + border.top + border.bottom;
 
+        nWidgetHeight = std::max<gint>(nWidgetHeight, rControlRegion.GetHeight());
+
         aEditRect = Rectangle(rControlRegion.TopLeft(), Size(rControlRegion.GetWidth(), nWidgetHeight));
 
         gtk_style_context_restore(mpEntryStyle);