[Libreoffice-commits] core.git: vcl/unx
Caolán McNamara
caolanm at redhat.com
Fri Oct 14 14:33:05 UTC 2016
vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 1054eb97a61d916b27ef4d0916b58a5a4fc6586b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Oct 14 15:29:27 2016 +0100
provide another fallback
Change-Id: I1438986674f7b4edb015f436bcaf7f07fd61d778
diff --git a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
index 0a9eddf..4ee12db 100644
--- a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
@@ -680,6 +680,8 @@ void GtkSalGraphics::PaintSpinButton(GtkStyleContext *context,
cairo_translate(cr, rControlRectangle.Left(), rControlRectangle.Top());
}
+#define FALLBACK_ARROW_SIZE 11 * 0.85
+
Rectangle GtkSalGraphics::NWGetComboBoxButtonRect( ControlType nType,
ControlPart nPart,
Rectangle aAreaRect )
@@ -691,7 +693,7 @@ Rectangle GtkSalGraphics::NWGetComboBoxButtonRect( ControlType nType,
GtkBorder padding;
gtk_style_context_get_padding( mpButtonStyle, gtk_style_context_get_state(mpButtonStyle), &padding);
- gint nArrowWidth;
+ gint nArrowWidth = FALLBACK_ARROW_SIZE;
gtk_style_context_get(mpComboboxButtonArrowStyle,
gtk_style_context_get_state(mpComboboxButtonArrowStyle),
"min-width", &nArrowWidth, nullptr);
@@ -726,7 +728,6 @@ Rectangle GtkSalGraphics::NWGetComboBoxButtonRect( ControlType nType,
return aButtonRect;
}
-#define FALLBACK_ARROW_SIZE 11 * 0.85
void GtkSalGraphics::PaintCombobox( GtkStateFlags flags, cairo_t *cr,
const Rectangle& rControlRectangle,
ControlType nType,
More information about the Libreoffice-commits
mailing list