summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-04-25 20:12:00 +0100
committerCaolán McNamara <caolanm@redhat.com>2015-04-25 20:12:32 +0100
commita57309fec223ef62a929807d078baafb0057005e (patch)
tree53ffbbf8fb5f07c2c8a6d1e115ee6eab0c0ade83 /vcl
parent062c3afd4e829692cf022c5011b2a226d21c35e4 (diff)
gtk3: honour the control region height if it is larger
Change-Id: I99a5a597dbc14521b27f9149411199d23b907c1e
Diffstat (limited to 'vcl')
-rw-r--r--vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx2
1 files changed, 2 insertions, 0 deletions
diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index 77dfa59bcac8..97c792949ab3 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);