summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTavmjong Bah <tavmjong@free.fr>2016-05-08 14:33:57 +0000
committertavmjong-free <tavmjong@free.fr>2016-05-08 14:33:57 +0000
commit0922f2de66fefdb001df408b166a04ef47342721 (patch)
treeb1d191713d5bf911996b151bd51ca09b83c74ffb
parentadd missing POTFILES.in line in mirror symmetry LPE (diff)
parentAttemt to fix ruler background for GTK 3.20. (diff)
downloadinkscape-0922f2de66fefdb001df408b166a04ef47342721.tar.gz
inkscape-0922f2de66fefdb001df408b166a04ef47342721.zip
Attempt to fix ruler background for GTK 3.20.
(bzr r14879)
-rw-r--r--share/ui/style.css8
-rw-r--r--src/widgets/ruler.cpp4
2 files changed, 12 insertions, 0 deletions
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;