diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2016-05-08 21:01:21 +0000 |
|---|---|---|
| committer | jabiertxof <info@marker.es> | 2016-05-08 21:01:21 +0000 |
| commit | 64bbbbb338a1d9a70d8ba29d6bfd1a8cec047867 (patch) | |
| tree | 607877ae8c3ec12f07be69614766c4398db13809 | |
| parent | First attempt to make fixed tweenk review (diff) | |
| parent | Attempt to fix ruler background for GTK 3.20. (diff) | |
| download | inkscape-64bbbbb338a1d9a70d8ba29d6bfd1a8cec047867.tar.gz inkscape-64bbbbb338a1d9a70d8ba29d6bfd1a8cec047867.zip | |
update to trunk
(bzr r13645.1.129)
| -rw-r--r-- | share/ui/style.css | 8 | ||||
| -rw-r--r-- | src/widgets/ruler.cpp | 4 |
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; |