[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - 2 commits - vcl/inc vcl/unx

[Caolán McNamara]

 vcl/inc/unx/gtk/gtkgdi.hxx                    |    1 -
 vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx |   20 ++++++++++++--------
 2 files changed, 12 insertions(+), 9 deletions(-)

New commits:
commit 3bc2079e4759a7098f0887b57d7bcd19acd9392b
Author: Caolán McNamara <caol...@redhat.com>
Date:   Wed May 20 20:39:09 2015 +0100

    gtk3: fix borders
    
    Change-Id: I7ea1198d08333d0ce95c2e6b5d7dcf8928a11838
    (cherry picked from commit b04c9cac994e39d28f5f715f560e97edcca0e666)

diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx 
b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index 8ed73fe..b59ccde 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -1375,10 +1375,10 @@ bool GtkSalGraphics::getNativeControlRegion( 
ControlType nType, ControlPart nPar
             int y2 = aEditRect.Bottom();
 
             rNativeBoundingRegion = aEditRect;
-            rNativeContentRegion = Rectangle(x1 + padding.left + border.left,
-                                             y1 + padding.top + border.top,
-                                             x2 - padding.right + border.right,
-                                             y2 - padding.bottom + 
border.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;
commit f698f884d4e0178dcc24fe8929fa92bf7fdcb251
Author: Caolán McNamara <caol...@redhat.com>
Date:   Wed May 20 12:10:34 2015 +0100

    gtk3: focus rects for combobox entries
    
    mpComboboxEntryStyle refuses to draw the left side. I have no
    idea why and have burned too much time on it, so use the normal
    EntryStyle and set its right junction to get the flat right side
    
    Change-Id: Iff5fb1c1b21d2935c3817e7825b86b8e30e899eb
    (cherry picked from commit 7cf1206e1e0872d8525f6012d0017917a4840783)

diff --git a/vcl/inc/unx/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx
index af86e7f..e0d0881 100644
--- a/vcl/inc/unx/gtk/gtkgdi.hxx
+++ b/vcl/inc/unx/gtk/gtkgdi.hxx
@@ -79,7 +79,6 @@ private:
     static GtkStyleContext *mpMenuItemStyle;
     static GtkStyleContext *mpSpinStyle;
     static GtkStyleContext *mpComboboxStyle;
-    static GtkStyleContext *mpComboboxEntryStyle;
     static GtkStyleContext *mpComboboxButtonStyle;
     static GtkStyleContext *mpListboxStyle;
     static GtkStyleContext *mpListboxButtonStyle;
diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx 
b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index 2a414dd..8ed73fe 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -35,7 +35,6 @@ GtkStyleContext* GtkSalGraphics::mpMenuStyle = NULL;
 GtkStyleContext* GtkSalGraphics::mpMenuItemStyle = NULL;
 GtkStyleContext* GtkSalGraphics::mpSpinStyle = NULL;
 GtkStyleContext* GtkSalGraphics::mpComboboxStyle = NULL;
-GtkStyleContext* GtkSalGraphics::mpComboboxEntryStyle = NULL;
 GtkStyleContext* GtkSalGraphics::mpComboboxButtonStyle = NULL;
 GtkStyleContext* GtkSalGraphics::mpListboxStyle = NULL;
 GtkStyleContext* GtkSalGraphics::mpListboxButtonStyle = NULL;
@@ -713,6 +712,10 @@ void GtkSalGraphics::PaintCombobox( GtkStateFlags flags, 
cairo_t *cr,
 
         if( nPart == PART_ENTIRE_CONTROL )
         {
+            gtk_style_context_save(mpEntryStyle);
+            gtk_style_context_set_state(mpEntryStyle, flags);
+            gtk_style_context_set_junction_sides(mpEntryStyle, 
GTK_JUNCTION_RIGHT);
+
             gtk_render_background(mpComboboxStyle, cr,
                                   0, 0,
                                   areaRect.GetWidth(), areaRect.GetHeight());
@@ -720,12 +723,14 @@ void GtkSalGraphics::PaintCombobox( GtkStateFlags flags, 
cairo_t *cr,
                              0, 0,
                              areaRect.GetWidth(), areaRect.GetHeight());
 
-            gtk_render_background(mpComboboxEntryStyle, cr,
+            gtk_render_background(mpEntryStyle, cr,
                                   0, 0,
                                   aEditBoxRect.GetWidth(), 
aEditBoxRect.GetHeight() );
-            gtk_render_frame(mpComboboxEntryStyle, cr,
+            gtk_render_frame(mpEntryStyle, cr,
                              0, 0,
                              aEditBoxRect.GetWidth(), aEditBoxRect.GetHeight() 
);
+
+            gtk_style_context_restore(mpEntryStyle);
         }
 
         gtk_render_background(mpComboboxButtonStyle, cr,
@@ -2038,7 +2043,6 @@ GtkSalGraphics::GtkSalGraphics( GtkSalFrame *pFrame, 
GtkWidget *pWindow )
     gtk_container_forall(GTK_CONTAINER(gComboBox),
                          get_combo_box_entry_inner_widgets,
                          NULL);
-    mpComboboxEntryStyle = gtk_widget_get_style_context(gComboBoxEntryWidget);
     mpComboboxButtonStyle = 
gtk_widget_get_style_context(gComboBoxButtonWidget);
 
     /* Listbox */

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits