[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - vcl/unx
Caolán McNamara
caolanm at redhat.com
Thu Jun 25 03:25:31 PDT 2015
vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 505429d50a5764015ae833946555204d06889d54
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jun 25 11:23:02 2015 +0100
gtk3: render menu arrows with menuitem style not menu style
Change-Id: I35de4ed31bfb9830f52aa5a25ea12bdf719c56ef
(cherry picked from commit a469002ab5dfffc108b4329fd7dddfc9b8fcce20)
diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index 7b0617b..080f6cc 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -902,7 +902,8 @@ bool GtkSalGraphics::drawNativeControl( ControlType nType, ControlPart nPart, co
renderType = RENDER_MENU_SEPERATOR;
break;
case PART_MENU_SUBMENU_ARROW:
- context = mpMenuStyle;
+ styleClass = GTK_STYLE_CLASS_ARROW;
+ context = mpCheckMenuItemStyle;
renderType = RENDER_ARROW;
break;
case PART_ENTIRE_CONTROL:
@@ -1288,7 +1289,7 @@ bool GtkSalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPar
gfloat arrow_scaling, arrow_size;
arrow_scaling = 0;
- gtk_style_context_get_style (mpMenuStyle,
+ gtk_style_context_get_style (mpCheckMenuItemStyle,
"arrow-scaling", &arrow_scaling,
NULL);
More information about the Libreoffice-commits
mailing list