diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2016-05-08 07:40:39 +0000 |
|---|---|---|
| committer | jabiertxof <info@marker.es> | 2016-05-08 07:40:39 +0000 |
| commit | d9c43e3d6f19a2f1102743b61d999b477bba4b9a (patch) | |
| tree | e77ac36155e0813318be3b9e7641338d86dac733 /src/widgets/ruler.cpp | |
| parent | Fixing page transforms (diff) | |
| parent | fix-bug-734201. stroke-to-path doesn't scale stroke width used in markers (diff) | |
| download | inkscape-d9c43e3d6f19a2f1102743b61d999b477bba4b9a.tar.gz inkscape-d9c43e3d6f19a2f1102743b61d999b477bba4b9a.zip | |
update to trunk
(bzr r13682.1.40)
Diffstat (limited to '')
| -rw-r--r-- | src/widgets/ruler.cpp | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/src/widgets/ruler.cpp b/src/widgets/ruler.cpp index 3a5e76277..5c715b0be 100644 --- a/src/widgets/ruler.cpp +++ b/src/widgets/ruler.cpp @@ -284,17 +284,12 @@ sp_ruler_init (SPRuler *ruler) priv->font_scale = DEFAULT_RULER_FONT_SCALE; #if GTK_CHECK_VERSION(3,0,0) - #if GTK_CHECK_VERSION(3,8,0) + // Hard code off-white for the moment. Where is @bg_color defined? const gchar *str = "SPRuler {\n" - " background-color: @theme_bg_color;\n" +// " background-color: @bg_color;\n" + " background-color: #f8f8f8;\n" "}\n"; - #else - const gchar *str = - "SPRuler {\n" - " background-color: @bg_color;\n" - "}\n"; - #endif GtkCssProvider *css = gtk_css_provider_new (); gtk_css_provider_load_from_data (css, str, -1, NULL); gtk_style_context_add_provider (gtk_widget_get_style_context (GTK_WIDGET (ruler)), @@ -1425,7 +1420,6 @@ sp_ruler_get_pos_rect (SPRuler *ruler, gdouble position) { GtkWidget *widget = GTK_WIDGET (ruler); - GtkStyle *style = gtk_widget_get_style (widget); SPRulerPrivate *priv = SP_RULER_GET_PRIVATE (ruler); GtkAllocation allocation; gint width, height; @@ -1440,8 +1434,19 @@ sp_ruler_get_pos_rect (SPRuler *ruler, gtk_widget_get_allocation (widget, &allocation); +#if GTK_CHECK_VERSION(3,0,0) + GtkStyleContext *context = gtk_widget_get_style_context (widget); + GtkBorder padding; + + gtk_style_context_get_border(context, static_cast<GtkStateFlags>(0), &padding); + + xthickness = padding.left + padding.right; + ythickness = padding.top + padding.bottom; +#else + GtkStyle *style = gtk_widget_get_style (widget); xthickness = style->xthickness; ythickness = style->ythickness; +#endif if (priv->orientation == GTK_ORIENTATION_HORIZONTAL) { |