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

[Caolán McNamara]

 vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 33b54e4a5c91876222ad6464139f5931c3e66da2
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri May 15 12:16:29 2015 +0100

    gtk3: add the border to the padding to get visible frames
    
    Change-Id: Ia631c445e6b61aa85df12c598b5c40da767b4bd1

diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index ea60f09..7ae15ef 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -1242,16 +1242,19 @@ bool GtkSalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPar
             GtkBorder padding;
             gtk_style_context_get_padding(mpFrameInStyle, GTK_STATE_FLAG_NORMAL, &padding);
 
+            GtkBorder border;
+            gtk_style_context_get_border(mpFrameInStyle, GTK_STATE_FLAG_NORMAL, &border);
+
             int x1 = aEditRect.Left();
             int y1 = aEditRect.Top();
             int x2 = aEditRect.Right();
             int y2 = aEditRect.Bottom();
 
             rNativeBoundingRegion = aEditRect;
-            rNativeContentRegion = Rectangle(x1 + padding.left,
-                                             y1 + padding.top,
-                                             x2 - padding.right,
-                                             y2 - padding.bottom);
+            rNativeContentRegion = Rectangle(x1 + padding.left + border.left,
+                                             y1 + padding.top + border.top,
+                                             x2 - padding.right + border.right,
+                                             y2 - padding.bottom + border.bottom);
 
             gtk_style_context_restore(mpFrameInStyle);
             return true;