From c3ef09704c74df622967eb75d22288264553a69e Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Sun, 8 May 2016 16:30:43 +0200 Subject: Attemt to fix ruler background for GTK 3.20. (bzr r14876.1.1) --- share/ui/style.css | 8 ++++++++ src/widgets/ruler.cpp | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/share/ui/style.css b/share/ui/style.css index 41b8ba426..3ee6f7450 100644 --- a/share/ui/style.css +++ b/share/ui/style.css @@ -9,6 +9,8 @@ * Left -> Right * * We need a standardized naming scheme. + * + * As of Gtk 3.20, you cannot use widget names. */ /* Lightest to darkest based on linear rgb */ @@ -27,10 +29,16 @@ GtkWidget { /* font-size: 12pt; */ } +/* Gtk <= 3.18 */ SPRuler { background-color: @bg_color05; } +/* Gtk > 3.18 */ +ruler-widget { + background-color: @bg_color05; +} + SPCanvas { background-color: @bg_color0; } diff --git a/src/widgets/ruler.cpp b/src/widgets/ruler.cpp index bcab535f9..deffd384a 100644 --- a/src/widgets/ruler.cpp +++ b/src/widgets/ruler.cpp @@ -168,6 +168,10 @@ sp_ruler_class_init (SPRulerClass *klass) GObjectClass *object_class = G_OBJECT_CLASS (klass); GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); +#if GTK_CHECK_VERSION(3,20,0) + gtk_widget_class_set_css_name (widget_class, "ruler-widget"); +#endif + object_class->dispose = sp_ruler_dispose; object_class->set_property = sp_ruler_set_property; object_class->get_property = sp_ruler_get_property; -- cgit v1.2.3