From bd005e6f4629a98d4bef4e4cc5f7925df2a00bb7 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Mon, 24 Dec 2012 12:12:58 +0000 Subject: ruler: (Merge from GIMP) Cache PangoLayout (bzr r11979) --- src/widgets/ruler.cpp | 195 ++++++++++++++++++++++++++++++++++---------------- 1 file changed, 135 insertions(+), 60 deletions(-) (limited to 'src/widgets/ruler.cpp') diff --git a/src/widgets/ruler.cpp b/src/widgets/ruler.cpp index 77332067e..2db84339e 100644 --- a/src/widgets/ruler.cpp +++ b/src/widgets/ruler.cpp @@ -40,6 +40,7 @@ struct _SPRulerPrivate GdkWindow *input_window; cairo_surface_t *backing_store; + PangoLayout *layout; SPRulerMetric *metric; @@ -58,44 +59,47 @@ enum { PROP_METRIC }; -static void sp_ruler_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec); -static void sp_ruler_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec); -static void sp_ruler_realize (GtkWidget *widget); -static void sp_ruler_unrealize (GtkWidget *widget); -static void sp_ruler_map (GtkWidget *widget); -static void sp_ruler_unmap (GtkWidget *widget); -static void sp_ruler_size_request (GtkWidget *widget, - GtkRequisition *requisition); +static void sp_ruler_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec); +static void sp_ruler_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec); +static void sp_ruler_realize (GtkWidget *widget); +static void sp_ruler_unrealize (GtkWidget *widget); +static void sp_ruler_map (GtkWidget *widget); +static void sp_ruler_unmap (GtkWidget *widget); +static void sp_ruler_size_request (GtkWidget *widget, + GtkRequisition *requisition); #if GTK_CHECK_VERSION(3,0,0) -static void sp_ruler_get_preferred_width (GtkWidget *widget, - gint *minimal_width, - gint *natural_width); +static void sp_ruler_get_preferred_width (GtkWidget *widget, + gint *minimal_width, + gint *natural_width); -static void sp_ruler_get_preferred_height (GtkWidget *widget, - gint *minimal_height, - gint *natural_height); +static void sp_ruler_get_preferred_height (GtkWidget *widget, + gint *minimal_height, + gint *natural_height); #endif -static void sp_ruler_size_allocate (GtkWidget *widget, - GtkAllocation *allocation); -static gboolean sp_ruler_motion_notify (GtkWidget *widget, - GdkEventMotion *event); -static gboolean sp_ruler_draw (GtkWidget *widget, - cairo_t *cr); +static void sp_ruler_size_allocate (GtkWidget *widget, + GtkAllocation *allocation); +static gboolean sp_ruler_motion_notify (GtkWidget *widget, + GdkEventMotion *event); +static gboolean sp_ruler_draw (GtkWidget *widget, + cairo_t *cr); #if !GTK_CHECK_VERSION(3,0,0) -static gboolean sp_ruler_expose (GtkWidget *widget, - GdkEventExpose *event); +static gboolean sp_ruler_expose (GtkWidget *widget, + GdkEventExpose *event); #endif -static void sp_ruler_draw_ticks (SPRuler *ruler); -static void sp_ruler_draw_pos (SPRuler *ruler); -static void sp_ruler_make_pixmap (SPRuler *ruler); +static void sp_ruler_draw_ticks (SPRuler *ruler); +static void sp_ruler_draw_pos (SPRuler *ruler); +static void sp_ruler_make_pixmap (SPRuler *ruler); + +static PangoLayout * sp_ruler_get_layout (GtkWidget *widget, + const gchar *text); #define SP_RULER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), SP_TYPE_RULER, SPRulerPrivate)) @@ -455,6 +459,12 @@ sp_ruler_unrealize(GtkWidget *widget) cairo_surface_destroy (priv->backing_store); priv->backing_store = NULL; } + + if (priv->layout) + { + g_object_unref (priv->layout); + priv->layout = NULL; + } if (priv->input_window) { @@ -487,10 +497,19 @@ sp_ruler_unmap (GtkWidget *widget) GTK_WIDGET_CLASS (sp_ruler_parent_class)->unmap (widget); } -static void sp_ruler_size_request(GtkWidget *widget, - GtkRequisition *requisition) +static void +sp_ruler_size_request (GtkWidget *widget, + GtkRequisition *requisition) { SPRulerPrivate *priv = SP_RULER_GET_PRIVATE (widget); + PangoLayout *layout; + PangoRectangle ink_rect; + gint size; + + layout = sp_ruler_get_layout (widget, "0123456789"); + pango_layout_get_pixel_extents (layout, &ink_rect, NULL); + + size = 2 + ink_rect.height * 1.7; #if GTK_CHECK_VERSION(3,0,0) GtkStyleContext *context = gtk_widget_get_style_context (widget); @@ -508,19 +527,19 @@ static void sp_ruler_size_request(GtkWidget *widget, { #if GTK_CHECK_VERSION(3,0,0) requisition->width += 1; - requisition->height += RULER_WIDTH; + requisition->height += size; #else requisition->width = style->xthickness * 2 + 1; - requisition->height = style->ythickness * 2 + RULER_WIDTH; + requisition->height = style->ythickness * 2 + size; #endif } else { #if GTK_CHECK_VERSION(3,0,0) - requisition->width += RULER_WIDTH; + requisition->width += size; requisition->height += 1; #else - requisition->width = style->xthickness * 2 + RULER_WIDTH; + requisition->width = style->xthickness * 2 + size; requisition->height = style->ythickness * 2 + 1; #endif } @@ -561,10 +580,10 @@ sp_ruler_size_allocate (GtkWidget *widget, } } - #if !GTK_CHECK_VERSION(3,0,0) -static gboolean sp_ruler_expose(GtkWidget *widget, - GdkEventExpose *event) +static gboolean +sp_ruler_expose (GtkWidget *widget, + GdkEventExpose *event) { cairo_t *cr = gdk_cairo_create(gtk_widget_get_window(widget)); GtkAllocation allocation; @@ -583,10 +602,9 @@ static gboolean sp_ruler_expose(GtkWidget *widget, } #endif - - -static gboolean sp_ruler_draw(GtkWidget *widget, - cairo_t *cr) +static gboolean +sp_ruler_draw (GtkWidget *widget, + cairo_t *cr) { SPRuler *ruler = SP_RULER (widget); SPRulerPrivate *priv = SP_RULER_GET_PRIVATE (ruler); @@ -601,7 +619,6 @@ static gboolean sp_ruler_draw(GtkWidget *widget, return FALSE; } - static void sp_ruler_make_pixmap (SPRuler *ruler) { @@ -621,7 +638,6 @@ sp_ruler_make_pixmap (SPRuler *ruler) allocation.height); } - static void sp_ruler_draw_pos (SPRuler *ruler) { @@ -870,11 +886,13 @@ sp_ruler_draw_ticks (SPRuler *ruler) gdouble start, end, cur; gchar unit_str[32]; gint digit_height; + gint digit_offset; gchar digit_str[2] = { '\0', '\0' }; gint text_size; gint pos; gdouble max_size; PangoLayout *layout; + PangoRectangle logical_rect, ink_rect; if (! gtk_widget_is_drawable (widget)) return; @@ -888,14 +906,11 @@ sp_ruler_draw_ticks (SPRuler *ruler) ythickness = style->ythickness; #endif - PangoContext *pango_context = gtk_widget_get_pango_context (widget); - layout = pango_layout_new (pango_context); - PangoFontDescription *fs = pango_font_description_new (); - pango_font_description_set_size (fs, RULER_FONT_SIZE); - pango_layout_set_font_description (layout, fs); - pango_font_description_free (fs); - - digit_height = (gint) floor (RULER_FONT_SIZE * RULER_FONT_VERTICAL_SPACING / PANGO_SCALE + 0.5); + layout = sp_ruler_get_layout (widget, "0123456789"); + pango_layout_get_extents (layout, &ink_rect, &logical_rect); + + digit_height = PANGO_PIXELS (ink_rect.height) + 2; + digit_offset = ink_rect.y; if (priv->orientation == GTK_ORIENTATION_HORIZONTAL) { @@ -1072,19 +1087,38 @@ sp_ruler_draw_ticks (SPRuler *ruler) if (priv->orientation == GTK_ORIENTATION_HORIZONTAL) { pango_layout_set_text (layout, unit_str, -1); - cairo_move_to(cr, pos+2, 0); + pango_layout_get_extents (layout, &logical_rect, NULL); + +#if GTK_CHECK_VERSION(3,0,0) + cairo_move_to (cr, + pos + 2, + border.top + PANGO_PIXELS (logical_rect.y - digit_offset)); +#else + cairo_move_to (cr, + pos + 2, + ythickness + PANGO_PIXELS (logical_rect.y - digit_offset)); +#endif + pango_cairo_show_layout(cr, layout); } else { - for (gint j = 0; j < (int) strlen (unit_str); j++) + gint j; + + for (j = 0; j < (int) strlen (unit_str); j++) { digit_str[0] = unit_str[j]; pango_layout_set_text (layout, digit_str, 1); + pango_layout_get_extents (layout, NULL, &logical_rect); + #if GTK_CHECK_VERSION(3,0,0) - cairo_move_to(cr, border.left + 1, pos + digit_height * (j) + 1); + cairo_move_to (cr, + border.left + 1, + pos + digit_height * j + 2 + PANGO_PIXELS (logical_rect.y - digit_offset)); #else - cairo_move_to(cr, xthickness + 1, pos + digit_height * (j) + 1); + cairo_move_to (cr, + xthickness + 1, + pos + digit_height * j + 2 + PANGO_PIXELS (logical_rect.y - digit_offset)); #endif pango_cairo_show_layout (cr, layout); } @@ -1101,8 +1135,9 @@ out: cairo_destroy (cr); } - -void sp_ruler_set_metric(SPRuler *ruler, SPMetric metric) +void +sp_ruler_set_metric (SPRuler *ruler, + SPMetric metric) { g_return_if_fail(ruler != NULL); g_return_if_fail(SP_IS_RULER (ruler)); @@ -1119,6 +1154,46 @@ void sp_ruler_set_metric(SPRuler *ruler, SPMetric metric) gtk_widget_queue_draw (GTK_WIDGET (ruler)); } +static PangoLayout* +sp_ruler_create_layout (GtkWidget *widget, + const gchar *text) +{ + PangoLayout *layout; + PangoAttrList *attrs; + PangoAttribute *attr; + + layout = gtk_widget_create_pango_layout (widget, text); + + attrs = pango_attr_list_new (); + + attr = pango_attr_scale_new (PANGO_SCALE_X_SMALL); + attr->start_index = 0; + attr->end_index = -1; + pango_attr_list_insert (attrs, attr); + + pango_layout_set_attributes (layout, attrs); + pango_attr_list_unref (attrs); + + return layout; +} + +static PangoLayout * +sp_ruler_get_layout (GtkWidget *widget, + const gchar *text) +{ + SPRulerPrivate *priv = SP_RULER_GET_PRIVATE (widget); + + if (priv->layout) + { + pango_layout_set_text (priv->layout, text, -1); + return priv->layout; + } + + priv->layout = sp_ruler_create_layout (widget, text); + + return priv->layout; +} + /* Local Variables: mode:c++ -- cgit v1.2.3 From c7843b31ce20afbc5cf12de77dc082477d5ce174 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Mon, 24 Dec 2012 12:36:29 +0000 Subject: ruler: (Merge from GIMP) private update_position function (bzr r11980) --- src/widgets/ruler.cpp | 73 +++++++++++++++++++++++++++++++++++---------------- 1 file changed, 50 insertions(+), 23 deletions(-) (limited to 'src/widgets/ruler.cpp') diff --git a/src/widgets/ruler.cpp b/src/widgets/ruler.cpp index 2db84339e..b7d8e8eb1 100644 --- a/src/widgets/ruler.cpp +++ b/src/widgets/ruler.cpp @@ -44,7 +44,6 @@ struct _SPRulerPrivate SPRulerMetric *metric; - gint slider_size; gint xsrc; gint ysrc; }; @@ -784,13 +783,48 @@ sp_ruler_draw_pos (SPRuler *ruler) #define UNUSED_PIXELS 2 // There appear to be two pixels that are not being used at each end of the ruler -GtkWidget* sp_ruler_new(GtkOrientation orientation) +/** + * sp_ruler_new: + * @orientation: the ruler's orientation + * + * Creates a new ruler. + * + * Return value: a new #SPRuler widget. + */ +GtkWidget * +sp_ruler_new (GtkOrientation orientation) { - return GTK_WIDGET(g_object_new(SP_TYPE_RULER, - "orientation", orientation, - NULL)); + return GTK_WIDGET (g_object_new (SP_TYPE_RULER, + "orientation", orientation, + NULL)); } +static void +sp_ruler_update_position (SPRuler *ruler, + gdouble x, + gdouble y) +{ + SPRulerPrivate *priv = SP_RULER_GET_PRIVATE (ruler); + GtkAllocation allocation; + gdouble lower; + gdouble upper; + + gtk_widget_get_allocation (GTK_WIDGET (ruler), &allocation); + sp_ruler_get_range (ruler, &lower, &upper, NULL); + + if (priv->orientation == GTK_ORIENTATION_HORIZONTAL) + { + sp_ruler_set_position (ruler, + lower + + (upper - lower) * x / allocation.width); + } + else + { + sp_ruler_set_position (ruler, + lower + + (upper - lower) * y / allocation.height); + } +} /** * sp_ruler_set_position: @@ -836,24 +870,9 @@ static gboolean sp_ruler_motion_notify (GtkWidget *widget, GdkEventMotion *event) { - GtkAllocation allocation; SPRuler *ruler = SP_RULER(widget); - SPRulerPrivate *priv = SP_RULER_GET_PRIVATE (ruler); - - gdk_event_request_motions(event); - gint x = event->x; - gint y = event->y; - - gtk_widget_get_allocation(widget, &allocation); - - if (priv->orientation == GTK_ORIENTATION_HORIZONTAL) - priv->position = priv->lower + (priv->upper - priv->lower) * (x + UNUSED_PIXELS) / (allocation.width + 2*UNUSED_PIXELS); - else - priv->position = priv->lower + (priv->upper - priv->lower) * (y + UNUSED_PIXELS) / (allocation.height + 2*UNUSED_PIXELS); - g_object_notify(G_OBJECT(ruler), "position"); - - gtk_widget_queue_draw(widget); + sp_ruler_update_position (ruler, event->x, event->y); return FALSE; } @@ -915,12 +934,20 @@ sp_ruler_draw_ticks (SPRuler *ruler) if (priv->orientation == GTK_ORIENTATION_HORIZONTAL) { width = allocation.width; // in pixels; is apparently 2 pixels shorter than the canvas at each end - height = allocation.height; +#if GTK_CHECK_VERSION(3,0,0) + height = allocation.height - (border.top + border.bottom); +#else + height = allocation.height - ythickness * 2; +#endif } else { width = allocation.height; - height = allocation.width; +#if GTK_CHECK_VERSION(3,0,0) + height = allocation.width - (border.top + border.bottom); +#else + height = allocation.width - ythickness * 2; +#endif } cr = cairo_create (priv->backing_store); -- cgit v1.2.3 From d6cd053cc2bbdf58a2df454b8c134320609f37da Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Mon, 24 Dec 2012 13:03:06 +0000 Subject: ruler: Merge sizing from GIMP. Don't use our UNUSED_PIXELS hack in Gtk+ 3 builds Fixed bugs: - https://launchpad.net/bugs/1069172 (bzr r11981) --- src/widgets/ruler.cpp | 94 +++++++++++++++++++++++++++++++-------------------- 1 file changed, 58 insertions(+), 36 deletions(-) (limited to 'src/widgets/ruler.cpp') diff --git a/src/widgets/ruler.cpp b/src/widgets/ruler.cpp index b7d8e8eb1..ab0089d0a 100644 --- a/src/widgets/ruler.cpp +++ b/src/widgets/ruler.cpp @@ -30,7 +30,10 @@ #define ROUND(x) ((int) ((x) + 0.5)) -struct _SPRulerPrivate +/* All distances below are in 1/72nd's of an inch. (According to + * Adobe, that's a point, but points are really 1/72.27 in.) + */ +typedef struct { GtkOrientation orientation; gdouble lower; @@ -46,7 +49,7 @@ struct _SPRulerPrivate gint xsrc; gint ysrc; -}; +} SPRulerPrivate; enum { PROP_0, @@ -75,11 +78,11 @@ static void sp_ruler_size_request (GtkWidget *widget, #if GTK_CHECK_VERSION(3,0,0) static void sp_ruler_get_preferred_width (GtkWidget *widget, - gint *minimal_width, + gint *minimum_width, gint *natural_width); static void sp_ruler_get_preferred_height (GtkWidget *widget, - gint *minimal_height, + gint *minimum_height, gint *natural_height); #endif @@ -217,7 +220,6 @@ sp_ruler_init (SPRuler *ruler) priv->orientation = GTK_ORIENTATION_HORIZONTAL; priv->xsrc = 0; priv->ysrc = 0; - priv->slider_size = 0; priv->lower = 0; priv->upper = 0; priv->position = 0; @@ -496,6 +498,33 @@ sp_ruler_unmap (GtkWidget *widget) GTK_WIDGET_CLASS (sp_ruler_parent_class)->unmap (widget); } +static void +sp_ruler_size_allocate (GtkWidget *widget, + GtkAllocation *allocation) +{ + SPRuler *ruler = SP_RULER(widget); + SPRulerPrivate *priv = SP_RULER_GET_PRIVATE (ruler); + GtkAllocation widget_allocation; + gboolean resized; + + gtk_widget_get_allocation (widget, &widget_allocation); + + resized = (widget_allocation.width != allocation->width || + widget_allocation.height != allocation->height); + + gtk_widget_set_allocation(widget, allocation); + + if (gtk_widget_get_realized (widget)) + { + gdk_window_move_resize (priv->input_window, + allocation->x, allocation->y, + allocation->width, allocation->height); + + if (resized) + sp_ruler_make_pixmap (ruler); + } +} + static void sp_ruler_size_request (GtkWidget *widget, GtkRequisition *requisition) @@ -545,41 +574,30 @@ sp_ruler_size_request (GtkWidget *widget, } #if GTK_CHECK_VERSION(3,0,0) -static void sp_ruler_get_preferred_width(GtkWidget *widget, gint *minimal_width, gint *natural_width) +static void +sp_ruler_get_preferred_width (GtkWidget *widget, + gint *minimum_width, + gint *natural_width) { - GtkRequisition requisition; - sp_ruler_size_request(widget, &requisition); - *minimal_width = *natural_width = requisition.width; -} + GtkRequisition requisition; -static void sp_ruler_get_preferred_height(GtkWidget *widget, gint *minimal_height, gint *natural_height) -{ - GtkRequisition requisition; - sp_ruler_size_request(widget, &requisition); - *minimal_height = *natural_height = requisition.height; + sp_ruler_size_request (widget, &requisition); + + *minimum_width = *natural_width = requisition.width; } -#endif static void -sp_ruler_size_allocate (GtkWidget *widget, - GtkAllocation *allocation) +sp_ruler_get_preferred_height (GtkWidget *widget, + gint *minimum_height, + gint *natural_height) { - SPRuler *ruler = SP_RULER(widget); - SPRulerPrivate *priv = SP_RULER_GET_PRIVATE (ruler); - - gtk_widget_set_allocation(widget, allocation); - - if (gtk_widget_get_realized (widget)) - { - gdk_window_move_resize (priv->input_window, - allocation->x, allocation->y, - allocation->width, allocation->height); - - sp_ruler_make_pixmap (ruler); - } + GtkRequisition requisition; + + sp_ruler_size_request(widget, &requisition); + + *minimum_height = *natural_height = requisition.height; } - -#if !GTK_CHECK_VERSION(3,0,0) +#else static gboolean sp_ruler_expose (GtkWidget *widget, GdkEventExpose *event) @@ -780,8 +798,12 @@ sp_ruler_draw_pos (SPRuler *ruler) } } - -#define UNUSED_PIXELS 2 // There appear to be two pixels that are not being used at each end of the ruler +// FIXME: Figure out why this is different in Gtk+ 2 and Gtk+ 3 +#if GTK_CHECK_VERSION(3,0,0) +# define UNUSED_PIXELS 0 +#else +# define UNUSED_PIXELS 2 // There appear to be two pixels that are not being used at each end of the ruler +#endif /** * sp_ruler_new: @@ -933,7 +955,7 @@ sp_ruler_draw_ticks (SPRuler *ruler) if (priv->orientation == GTK_ORIENTATION_HORIZONTAL) { - width = allocation.width; // in pixels; is apparently 2 pixels shorter than the canvas at each end + width = allocation.width; #if GTK_CHECK_VERSION(3,0,0) height = allocation.height - (border.top + border.bottom); #else -- cgit v1.2.3 From d91fb6088a6810b96746f4be00a47ac27b1a0b18 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Mon, 24 Dec 2012 23:41:59 +0000 Subject: ruler: Drop unused members of SPRulerMetric (bzr r11982) --- src/widgets/ruler.cpp | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'src/widgets/ruler.cpp') diff --git a/src/widgets/ruler.cpp b/src/widgets/ruler.cpp index ab0089d0a..60bbb4b14 100644 --- a/src/widgets/ruler.cpp +++ b/src/widgets/ruler.cpp @@ -105,19 +105,18 @@ static PangoLayout * sp_ruler_get_layout (GtkWidget *widget, #define SP_RULER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), SP_TYPE_RULER, SPRulerPrivate)) -// Note: const casts are due to SPRuler being const-broken and not scheduled for any more fixes. /// Ruler metrics. static SPRulerMetric const sp_ruler_metrics[] = { // NOTE: the order of records in this struct must correspond to the SPMetric enum. - {const_cast("NONE"), const_cast(""), 1, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, - {const_cast("millimeters"), const_cast("mm"), PX_PER_MM, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, - {const_cast("centimeters"), const_cast("cm"), PX_PER_CM, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, - {const_cast("inches"), const_cast("in"), PX_PER_IN, { 1, 2, 4, 8, 16, 32, 64, 128, 256, 512 }, { 1, 2, 4, 8, 16 }}, - {const_cast("feet"), const_cast("ft"), PX_PER_FT, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, - {const_cast("points"), const_cast("pt"), PX_PER_PT, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, - {const_cast("picas"), const_cast("pc"), PX_PER_PC, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, - {const_cast("pixels"), const_cast("px"), PX_PER_PX, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, - {const_cast("meters"), const_cast("m"), PX_PER_M, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, + {1, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, // SP_NONE + {PX_PER_MM, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, // SP_MM + {PX_PER_CM, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, // SP_CM + {PX_PER_IN, { 1, 2, 4, 8, 16, 32, 64, 128, 256, 512 }, { 1, 2, 4, 8, 16 }}, // SP_IN + {PX_PER_FT, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, // SP_FT + {PX_PER_PT, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, // SP_PT + {PX_PER_PC, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, // SP_PC + {PX_PER_PX, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, // SP_PX + {PX_PER_M, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, // SP_M }; G_DEFINE_TYPE_WITH_CODE (SPRuler, sp_ruler, GTK_TYPE_WIDGET, -- cgit v1.2.3 From bdfa35f01e14b6f63c5f13022ce0c46289d5f1d8 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Tue, 25 Dec 2012 18:27:15 +0000 Subject: Stop using UNUSED_PIXELS hack in ruler. This was only required because of the padding used in the desktop widget (bzr r11985) --- src/widgets/ruler.cpp | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'src/widgets/ruler.cpp') diff --git a/src/widgets/ruler.cpp b/src/widgets/ruler.cpp index 60bbb4b14..e26b13fa7 100644 --- a/src/widgets/ruler.cpp +++ b/src/widgets/ruler.cpp @@ -797,13 +797,6 @@ sp_ruler_draw_pos (SPRuler *ruler) } } -// FIXME: Figure out why this is different in Gtk+ 2 and Gtk+ 3 -#if GTK_CHECK_VERSION(3,0,0) -# define UNUSED_PIXELS 0 -#else -# define UNUSED_PIXELS 2 // There appear to be two pixels that are not being used at each end of the ruler -#endif - /** * sp_ruler_new: * @orientation: the ruler's orientation @@ -1032,7 +1025,7 @@ sp_ruler_draw_ticks (SPRuler *ruler) if ((upper - lower) == 0) goto out; - increment = (gdouble) (width + 2*UNUSED_PIXELS) / (upper - lower); // screen pixels per ruler unit + increment = (gdouble) width / (upper - lower); /* determine the scale * Use the maximum extents of the ruler to determine the largest @@ -1091,7 +1084,7 @@ sp_ruler_draw_ticks (SPRuler *ruler) // be e.g. 641.50000000000; rounding behaviour is not defined in such a case (see round.h) // and jitter will be apparent (upon redrawing some of the lines on the ruler might jump a // by a pixel, and jump back on the next redraw). This is suppressed by adding 1e-9 (that's only one nanopixel ;-)) - pos = gint(Inkscape::round((cur - lower) * increment + 1e-12)) - UNUSED_PIXELS; + pos = gint(Inkscape::round((cur - lower) * increment + 1e-12)); #if GTK_CHECK_VERSION(3,0,0) if (priv->orientation == GTK_ORIENTATION_HORIZONTAL) -- cgit v1.2.3 From adfcf364bc0b66fdb4ac8f3cc19344337a00bf97 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Wed, 26 Dec 2012 10:39:35 +0000 Subject: ruler: (GIMP merge) Allow label size to be specified as a style property (bzr r11987) --- src/widgets/ruler.cpp | 149 +++++++++++++++++++++++++++++++++++++------------- 1 file changed, 111 insertions(+), 38 deletions(-) (limited to 'src/widgets/ruler.cpp') diff --git a/src/widgets/ruler.cpp b/src/widgets/ruler.cpp index e26b13fa7..851af640a 100644 --- a/src/widgets/ruler.cpp +++ b/src/widgets/ruler.cpp @@ -1,5 +1,20 @@ /* - * Customized ruler class for inkscape + * Customized ruler class for inkscape. Note that this is a fork of + * the GimpRuler widget from GIMP: libgimpwidgets/gimpruler.c. + * The GIMP code is released under the GPL 3. The GIMP code itself + * is a fork of the now-obsolete GtkRuler widget from GTK+ 2. + * + * Major differences between implementations in Inkscape and GIMP are + * as follows: + * - We use values from a table of ruler metrics to set sizing depending + * on the desired unit for the ruler scale. GIMP uses the same metrics + * for all units, but allows the unit to be specified. + * + * - We use a default font size of PANGO_SCALE_X_SMALL for labels, + * GIMP uses PANGO_SCALE_SMALL (i.e., a bit larger than ours). + * + * - In GIMP, the ruler position follows "track widgets" by connecting + * to their GtkWidget:motion-notify-event. * * Authors: * Lauris Kaplinski @@ -7,6 +22,7 @@ * bulia byak * Diederik van Lierop * Jon A. Cruz + * Alex Valavanis * * Copyright (C) 1999-2011 authors * @@ -18,17 +34,29 @@ #include #include "widget-sizes.h" -#include "desktop-widget.h" #include "ruler.h" #include "unit-constants.h" #include "round.h" #include +#define ROUND(x) ((int) ((x) + 0.5)) + #define GTK_PARAM_READWRITE G_PARAM_READWRITE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB -#define MINIMUM_INCR 5 +#define DEFAULT_RULER_FONT_SCALE PANGO_SCALE_X_SMALL +#define MINIMUM_INCR 5 + + +enum { + PROP_0, + PROP_ORIENTATION, + PROP_LOWER, + PROP_UPPER, + PROP_POSITION, + PROP_MAX_SIZE, + PROP_METRIC +}; -#define ROUND(x) ((int) ((x) + 0.5)) /* All distances below are in 1/72nd's of an inch. (According to * Adobe, that's a point, but points are really 1/72.27 in.) @@ -44,6 +72,7 @@ typedef struct GdkWindow *input_window; cairo_surface_t *backing_store; PangoLayout *layout; + gdouble font_scale; SPRulerMetric *metric; @@ -51,16 +80,25 @@ typedef struct gint ysrc; } SPRulerPrivate; -enum { - PROP_0, - PROP_ORIENTATION, - PROP_LOWER, - PROP_UPPER, - PROP_POSITION, - PROP_MAX_SIZE, - PROP_METRIC +#define SP_RULER_GET_PRIVATE(ruler) \ + G_TYPE_INSTANCE_GET_PRIVATE (ruler, SP_TYPE_RULER, SPRulerPrivate) + + +/// Ruler metrics. +static SPRulerMetric const sp_ruler_metrics[] = { + // NOTE: the order of records in this struct must correspond to the SPMetric enum. + {1, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, // SP_NONE + {PX_PER_MM, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, // SP_MM + {PX_PER_CM, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, // SP_CM + {PX_PER_IN, { 1, 2, 4, 8, 16, 32, 64, 128, 256, 512 }, { 1, 2, 4, 8, 16 }}, // SP_IN + {PX_PER_FT, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, // SP_FT + {PX_PER_PT, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, // SP_PT + {PX_PER_PC, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, // SP_PC + {PX_PER_PX, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, // SP_PX + {PX_PER_M, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, // SP_M }; + static void sp_ruler_set_property (GObject *object, guint prop_id, const GValue *value, @@ -69,12 +107,13 @@ static void sp_ruler_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec); + static void sp_ruler_realize (GtkWidget *widget); static void sp_ruler_unrealize (GtkWidget *widget); static void sp_ruler_map (GtkWidget *widget); static void sp_ruler_unmap (GtkWidget *widget); -static void sp_ruler_size_request (GtkWidget *widget, - GtkRequisition *requisition); +static void sp_ruler_size_allocate (GtkWidget *widget, + GtkAllocation *allocation); #if GTK_CHECK_VERSION(3,0,0) static void sp_ruler_get_preferred_width (GtkWidget *widget, @@ -84,10 +123,14 @@ static void sp_ruler_get_preferred_width (GtkWidget *widget, static void sp_ruler_get_preferred_height (GtkWidget *widget, gint *minimum_height, gint *natural_height); +static void sp_ruler_style_updated (GtkWidget *widget); +#else +static void sp_ruler_size_request (GtkWidget *widget, + GtkRequisition *requisition); +static void sp_ruler_style_set (GtkWidget *widget, + GtkStyle *prev_style); #endif -static void sp_ruler_size_allocate (GtkWidget *widget, - GtkAllocation *allocation); static gboolean sp_ruler_motion_notify (GtkWidget *widget, GdkEventMotion *event); static gboolean sp_ruler_draw (GtkWidget *widget, @@ -103,25 +146,11 @@ static void sp_ruler_make_pixmap (SPRuler *ruler); static PangoLayout * sp_ruler_get_layout (GtkWidget *widget, const gchar *text); -#define SP_RULER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), SP_TYPE_RULER, SPRulerPrivate)) -/// Ruler metrics. -static SPRulerMetric const sp_ruler_metrics[] = { - // NOTE: the order of records in this struct must correspond to the SPMetric enum. - {1, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, // SP_NONE - {PX_PER_MM, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, // SP_MM - {PX_PER_CM, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, // SP_CM - {PX_PER_IN, { 1, 2, 4, 8, 16, 32, 64, 128, 256, 512 }, { 1, 2, 4, 8, 16 }}, // SP_IN - {PX_PER_FT, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, // SP_FT - {PX_PER_PT, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, // SP_PT - {PX_PER_PC, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, // SP_PC - {PX_PER_PX, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, // SP_PX - {PX_PER_M, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, // SP_M -}; +G_DEFINE_TYPE (SPRuler, sp_ruler, GTK_TYPE_WIDGET) + +#define parent_class sp_ruler_parent_class -G_DEFINE_TYPE_WITH_CODE (SPRuler, sp_ruler, GTK_TYPE_WIDGET, - G_IMPLEMENT_INTERFACE (GTK_TYPE_ORIENTABLE, - NULL)) static void sp_ruler_class_init (SPRulerClass *klass) @@ -140,18 +169,25 @@ sp_ruler_class_init (SPRulerClass *klass) #if GTK_CHECK_VERSION(3,0,0) widget_class->get_preferred_width = sp_ruler_get_preferred_width; widget_class->get_preferred_height = sp_ruler_get_preferred_height; + widget_class->style_updated = sp_ruler_style_updated; widget_class->draw = sp_ruler_draw; #else widget_class->size_request = sp_ruler_size_request; + widget_class->style_set = sp_ruler_style_set; widget_class->expose_event = sp_ruler_expose; #endif widget_class->motion_notify_event = sp_ruler_motion_notify; g_type_class_add_private (object_class, sizeof (SPRulerPrivate)); - g_object_class_override_property (object_class, - PROP_ORIENTATION, - "orientation"); + g_object_class_install_property (object_class, + PROP_ORIENTATION, + g_param_spec_enum ("orientation", + _("Orientation"), + _("The orientation of the ruler"), + GTK_TYPE_ORIENTATION, + GTK_ORIENTATION_HORIZONTAL, + static_cast(GTK_PARAM_READWRITE))); g_object_class_install_property (object_class, PROP_LOWER, @@ -206,7 +242,15 @@ sp_ruler_class_init (SPRulerClass *klass) _("The metric used for the ruler"), 0, 8, SP_PX, - static_cast(GTK_PARAM_READWRITE))); + static_cast(GTK_PARAM_READWRITE))); + + gtk_widget_class_install_style_property (widget_class, + g_param_spec_double ("font-scale", + NULL, NULL, + 0.0, + G_MAXDOUBLE, + DEFAULT_RULER_FONT_SCALE, + G_PARAM_READABLE)); } static void @@ -224,6 +268,7 @@ sp_ruler_init (SPRuler *ruler) priv->position = 0; priv->max_size = 0; priv->backing_store = NULL; + priv->font_scale = DEFAULT_RULER_FONT_SCALE; sp_ruler_set_metric(ruler, SP_PX); } @@ -572,6 +617,33 @@ sp_ruler_size_request (GtkWidget *widget, } } +static void +#if GTK_CHECK_VERSION(3,0,0) +sp_ruler_style_updated (GtkWidget *widget) +#else +sp_ruler_style_set (GtkWidget *widget, + GtkStyle *prev_style) +#endif +{ + SPRulerPrivate *priv = SP_RULER_GET_PRIVATE (widget); + +#if GTK_CHECK_VERSION(3,0,0) + GTK_WIDGET_CLASS (sp_ruler_parent_class)->style_updated (widget); +#else + GTK_WIDGET_CLASS (sp_ruler_parent_class)->style_set (widget, prev_style); +#endif + + gtk_widget_style_get (widget, + "font-scale", &priv->font_scale, + NULL); + + if (priv->layout) + { + g_object_unref (priv->layout); + priv->layout = NULL; + } +} + #if GTK_CHECK_VERSION(3,0,0) static void sp_ruler_get_preferred_width (GtkWidget *widget, @@ -1199,6 +1271,7 @@ static PangoLayout* sp_ruler_create_layout (GtkWidget *widget, const gchar *text) { + SPRulerPrivate *priv = SP_RULER_GET_PRIVATE (widget); PangoLayout *layout; PangoAttrList *attrs; PangoAttribute *attr; @@ -1207,7 +1280,7 @@ sp_ruler_create_layout (GtkWidget *widget, attrs = pango_attr_list_new (); - attr = pango_attr_scale_new (PANGO_SCALE_X_SMALL); + attr = pango_attr_scale_new (priv->font_scale); attr->start_index = 0; attr->end_index = -1; pango_attr_list_insert (attrs, attr); -- cgit v1.2.3 From 81839e6ebd1007f4674e65e5908ec4fd46fb64a6 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Wed, 26 Dec 2012 12:53:09 +0000 Subject: ruler: (GIMP merge) Add track_widget API and fix GTK+ 3 build failure in color slider (bzr r11988) --- src/widgets/ruler.cpp | 164 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 164 insertions(+) (limited to 'src/widgets/ruler.cpp') diff --git a/src/widgets/ruler.cpp b/src/widgets/ruler.cpp index 851af640a..31ef28c61 100644 --- a/src/widgets/ruler.cpp +++ b/src/widgets/ruler.cpp @@ -78,6 +78,8 @@ typedef struct gint xsrc; gint ysrc; + + GList *track_widgets; } SPRulerPrivate; #define SP_RULER_GET_PRIVATE(ruler) \ @@ -99,6 +101,7 @@ static SPRulerMetric const sp_ruler_metrics[] = { }; +static void sp_ruler_dispose (GObject *object); static void sp_ruler_set_property (GObject *object, guint prop_id, const GValue *value, @@ -158,6 +161,7 @@ sp_ruler_class_init (SPRulerClass *klass) GObjectClass *object_class = G_OBJECT_CLASS (klass); GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); + object_class->dispose = sp_ruler_dispose; object_class->set_property = sp_ruler_set_property; object_class->get_property = sp_ruler_get_property; @@ -273,6 +277,18 @@ sp_ruler_init (SPRuler *ruler) sp_ruler_set_metric(ruler, SP_PX); } +static void +sp_ruler_dispose (GObject *object) +{ + SPRuler *ruler = SP_RULER (object); + SPRulerPrivate *priv = SP_RULER_GET_PRIVATE (ruler); + + while (priv->track_widgets) + sp_ruler_remove_track_widget (ruler, GTK_WIDGET(priv->track_widgets->data)); + + G_OBJECT_CLASS (parent_class)->dispose (object); +} + /** * sp_ruler_set_range: @@ -912,6 +928,154 @@ sp_ruler_update_position (SPRuler *ruler, } } +/* Returns TRUE if a translation should be done */ +static gboolean +gtk_widget_get_translation_to_window (GtkWidget *widget, + GdkWindow *window, + int *x, + int *y) +{ + GdkWindow *w, *widget_window; + + if (! gtk_widget_get_has_window (widget)) + { + GtkAllocation allocation; + + gtk_widget_get_allocation (widget, &allocation); + + *x = -allocation.x; + *y = -allocation.y; + } + else + { + *x = 0; + *y = 0; + } + + widget_window = gtk_widget_get_window (widget); + + for (w = window; + w && w != widget_window; + w = gdk_window_get_effective_parent (w)) + { + gdouble px, py; + + gdk_window_coords_to_parent (w, *x, *y, &px, &py); + + *x += px; + *y += px; + } + + if (w == NULL) + { + *x = 0; + *y = 0; + return FALSE; + } + + return TRUE; +} + +static void +sp_ruler_event_to_widget_coords (GtkWidget *widget, + GdkWindow *window, + gdouble event_x, + gdouble event_y, + gint *widget_x, + gint *widget_y) +{ + gint tx, ty; + + if (gtk_widget_get_translation_to_window (widget, window, &tx, &ty)) + { + event_x += tx; + event_y += ty; + } + + *widget_x = event_x; + *widget_y = event_y; +} + +static gboolean +sp_ruler_track_widget_motion_notify (GtkWidget *widget, + GdkEventMotion *mevent, + SPRuler *ruler) +{ + gint widget_x; + gint widget_y; + gint ruler_x; + gint ruler_y; + + widget = gtk_get_event_widget (reinterpret_cast(mevent)); + + sp_ruler_event_to_widget_coords (widget, mevent->window, + mevent->x, mevent->y, + &widget_x, &widget_y); + + if (gtk_widget_translate_coordinates (widget, GTK_WIDGET (ruler), + widget_x, widget_y, + &ruler_x, &ruler_y)) + { + sp_ruler_update_position (ruler, ruler_x, ruler_y); + } + + return FALSE; +} + +void +sp_ruler_add_track_widget (SPRuler *ruler, + GtkWidget *widget) +{ + SPRulerPrivate *priv; + + g_return_if_fail (SP_IS_RULER (ruler)); + g_return_if_fail (GTK_IS_WIDGET (ruler)); + + priv = SP_RULER_GET_PRIVATE (ruler); + + g_return_if_fail (g_list_find (priv->track_widgets, widget) == NULL); + + priv->track_widgets = g_list_prepend (priv->track_widgets, widget); + + g_signal_connect (widget, "motion-notify-event", + G_CALLBACK (sp_ruler_track_widget_motion_notify), + ruler); + g_signal_connect (widget, "destroy", + G_CALLBACK (sp_ruler_remove_track_widget), + ruler); +} + +/** + * sp_ruler_remove_track_widget: + * @ruler: an #SPRuler + * @widget: the track widget to remove + * + * Removes a previously added track widget from the ruler. See + * sp_ruler_add_track_widget(). + */ +void +sp_ruler_remove_track_widget (SPRuler *ruler, + GtkWidget *widget) +{ + SPRulerPrivate *priv; + + g_return_if_fail (SP_IS_RULER (ruler)); + g_return_if_fail (GTK_IS_WIDGET (ruler)); + + priv = SP_RULER_GET_PRIVATE (ruler); + + g_return_if_fail (g_list_find (priv->track_widgets, widget) != NULL); + + priv->track_widgets = g_list_remove (priv->track_widgets, widget); + + g_signal_handlers_disconnect_by_func (widget, + (gpointer) G_CALLBACK (sp_ruler_track_widget_motion_notify), + ruler); + g_signal_handlers_disconnect_by_func (widget, + (gpointer) G_CALLBACK (sp_ruler_remove_track_widget), + ruler); +} + /** * sp_ruler_set_position: * @ruler: a #SPRuler -- cgit v1.2.3 From 6d2a2b893f0038412659b61fc5d4a5af491be6fa Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Wed, 26 Dec 2012 18:38:53 +0000 Subject: Revert C++ casting for setting HSL map in sp-color-scales (bzr r11991) --- src/widgets/ruler.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/widgets/ruler.cpp') diff --git a/src/widgets/ruler.cpp b/src/widgets/ruler.cpp index 31ef28c61..733de2239 100644 --- a/src/widgets/ruler.cpp +++ b/src/widgets/ruler.cpp @@ -13,8 +13,7 @@ * - We use a default font size of PANGO_SCALE_X_SMALL for labels, * GIMP uses PANGO_SCALE_SMALL (i.e., a bit larger than ours). * - * - In GIMP, the ruler position follows "track widgets" by connecting - * to their GtkWidget:motion-notify-event. + * - We abbreviate large numbers in tick-labels (e.g., 10000 -> 10k) * * Authors: * Lauris Kaplinski -- cgit v1.2.3 From cf96e2170b696c55977ed90b020813684b9d0000 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Mon, 31 Dec 2012 13:38:00 +0000 Subject: rulers: (Merge from GIMP) Set range in ruler units, not in px (bzr r12002) --- src/widgets/ruler.cpp | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) (limited to 'src/widgets/ruler.cpp') diff --git a/src/widgets/ruler.cpp b/src/widgets/ruler.cpp index 733de2239..34d8f1bc5 100644 --- a/src/widgets/ruler.cpp +++ b/src/widgets/ruler.cpp @@ -88,15 +88,15 @@ typedef struct /// Ruler metrics. static SPRulerMetric const sp_ruler_metrics[] = { // NOTE: the order of records in this struct must correspond to the SPMetric enum. - {1, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, // SP_NONE - {PX_PER_MM, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, // SP_MM - {PX_PER_CM, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, // SP_CM - {PX_PER_IN, { 1, 2, 4, 8, 16, 32, 64, 128, 256, 512 }, { 1, 2, 4, 8, 16 }}, // SP_IN - {PX_PER_FT, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, // SP_FT - {PX_PER_PT, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, // SP_PT - {PX_PER_PC, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, // SP_PC - {PX_PER_PX, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, // SP_PX - {PX_PER_M, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, // SP_M + {{ 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, // SP_NONE + {{ 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, // SP_MM + {{ 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, // SP_CM + {{ 1, 2, 4, 8, 16, 32, 64, 128, 256, 512 }, { 1, 2, 4, 8, 16 }}, // SP_IN + {{ 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, // SP_FT + {{ 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, // SP_PT + {{ 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, // SP_PC + {{ 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, // SP_PX + {{ 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, // SP_M }; @@ -1252,11 +1252,6 @@ sp_ruler_draw_ticks (SPRuler *ruler) sp_ruler_get_range (ruler, &lower, &upper, &max_size); - upper /= priv->metric->pixels_per_unit; // upper and lower are expressed in ruler units - lower /= priv->metric->pixels_per_unit; - /* "pixels_per_unit" should be "points_per_unit". This is the size of the unit - * in 1/72nd's of an inch and has nothing to do with screen pixels */ - if ((upper - lower) == 0) goto out; @@ -1272,7 +1267,7 @@ sp_ruler_draw_ticks (SPRuler *ruler) * actually measuring the text width, so that the result for the * scale looks consistent with an accompanying vruler */ - scale = (gint)(ceil(priv->max_size / priv->metric->pixels_per_unit)); + scale = ceil (priv->max_size); sprintf (unit_str, "%d", scale); text_size = strlen (unit_str) * digit_height + 1; -- cgit v1.2.3 From 058a3dad9964207749fbe38bfc826b66fd1dca0b Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Mon, 31 Dec 2012 14:58:17 +0000 Subject: rulers: Merge all remaining changes from GIMP. Up-to-date at commit a929a (2012-10-23) in GIMP git repo, gtk3-port branch (bzr r12003) --- src/widgets/ruler.cpp | 201 ++++++++++++++++++++++++++------------------------ 1 file changed, 104 insertions(+), 97 deletions(-) (limited to 'src/widgets/ruler.cpp') diff --git a/src/widgets/ruler.cpp b/src/widgets/ruler.cpp index 34d8f1bc5..ce79b9dac 100644 --- a/src/widgets/ruler.cpp +++ b/src/widgets/ruler.cpp @@ -6,9 +6,8 @@ * * Major differences between implementations in Inkscape and GIMP are * as follows: - * - We use values from a table of ruler metrics to set sizing depending - * on the desired unit for the ruler scale. GIMP uses the same metrics - * for all units, but allows the unit to be specified. + * - We use a 1,2,4,8... scale for inches and 1,2,5,10... for everything + * else. GIMP uses 1,2,5,10... for everything. * * - We use a default font size of PANGO_SCALE_X_SMALL for labels, * GIMP uses PANGO_SCALE_SMALL (i.e., a bit larger than ours). @@ -49,11 +48,11 @@ enum { PROP_0, PROP_ORIENTATION, + PROP_UNIT, PROP_LOWER, PROP_UPPER, PROP_POSITION, - PROP_MAX_SIZE, - PROP_METRIC + PROP_MAX_SIZE }; @@ -63,6 +62,7 @@ enum { typedef struct { GtkOrientation orientation; + SPMetric unit; gdouble lower; gdouble upper; gdouble position; @@ -73,8 +73,6 @@ typedef struct PangoLayout *layout; gdouble font_scale; - SPRulerMetric *metric; - gint xsrc; gint ysrc; @@ -85,20 +83,23 @@ typedef struct G_TYPE_INSTANCE_GET_PRIVATE (ruler, SP_TYPE_RULER, SPRulerPrivate) -/// Ruler metrics. -static SPRulerMetric const sp_ruler_metrics[] = { - // NOTE: the order of records in this struct must correspond to the SPMetric enum. - {{ 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, // SP_NONE - {{ 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, // SP_MM - {{ 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, // SP_CM - {{ 1, 2, 4, 8, 16, 32, 64, 128, 256, 512 }, { 1, 2, 4, 8, 16 }}, // SP_IN - {{ 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, // SP_FT - {{ 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, // SP_PT - {{ 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, // SP_PC - {{ 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, // SP_PX - {{ 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, // SP_M +struct SPRulerMetric +{ + gdouble ruler_scale[16]; + gint subdivide[5]; }; +// Ruler metric for general use. +static SPRulerMetric const ruler_metric_general = { + { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000, 2500, 5000, 10000, 25000, 50000, 100000 }, + { 1, 5, 10, 50, 100 } +}; + +// Ruler metric for inch scales. +static SPRulerMetric const ruler_metric_inches = { + { 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768 }, + { 1, 2, 4, 8, 16 } +}; static void sp_ruler_dispose (GObject *object); static void sp_ruler_set_property (GObject *object, @@ -192,6 +193,16 @@ sp_ruler_class_init (SPRulerClass *klass) GTK_ORIENTATION_HORIZONTAL, static_cast(GTK_PARAM_READWRITE))); + /* FIXME: Should probably use g_param_spec_enum */ + g_object_class_install_property (object_class, + PROP_UNIT, + g_param_spec_uint ("unit", + _("Unit"), + _("Unit of the ruler"), + 0, 8, + SP_PX, + static_cast(GTK_PARAM_READWRITE))); + g_object_class_install_property (object_class, PROP_LOWER, g_param_spec_double ("lower", @@ -231,21 +242,6 @@ sp_ruler_class_init (SPRulerClass *klass) G_MAXDOUBLE, 0.0, static_cast(GTK_PARAM_READWRITE))); - /** - * SPRuler:metric: - * - * The metric used for the ruler. - * - * TODO: This should probably use g_param_spec_enum - */ - g_object_class_install_property (object_class, - PROP_METRIC, - g_param_spec_uint("metric", - _("Metric"), - _("The metric used for the ruler"), - 0, 8, - SP_PX, - static_cast(GTK_PARAM_READWRITE))); gtk_widget_class_install_style_property (widget_class, g_param_spec_double ("font-scale", @@ -264,16 +260,13 @@ sp_ruler_init (SPRuler *ruler) gtk_widget_set_has_window (GTK_WIDGET (ruler), FALSE); priv->orientation = GTK_ORIENTATION_HORIZONTAL; - priv->xsrc = 0; - priv->ysrc = 0; + priv->unit = SP_PX; priv->lower = 0; priv->upper = 0; priv->position = 0; priv->max_size = 0; priv->backing_store = NULL; priv->font_scale = DEFAULT_RULER_FONT_SCALE; - - sp_ruler_set_metric(ruler, SP_PX); } static void @@ -378,6 +371,11 @@ sp_ruler_set_property (GObject *object, priv->orientation = static_cast(g_value_get_enum (value)); gtk_widget_queue_resize (GTK_WIDGET (ruler)); break; + + case PROP_UNIT: + sp_ruler_set_unit (ruler, static_cast(g_value_get_int (value))); + break; + case PROP_LOWER: sp_ruler_set_range (ruler, g_value_get_double (value), @@ -390,18 +388,18 @@ sp_ruler_set_property (GObject *object, g_value_get_double (value), priv->max_size); break; + case PROP_POSITION: sp_ruler_set_position (ruler, g_value_get_double (value)); break; + case PROP_MAX_SIZE: sp_ruler_set_range (ruler, priv->lower, priv->upper, g_value_get_double (value)); break; - case PROP_METRIC: - sp_ruler_set_metric (ruler, static_cast(g_value_get_enum (value))); - break; + default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -422,6 +420,10 @@ sp_ruler_get_property (GObject *object, case PROP_ORIENTATION: g_value_set_enum (value, priv->orientation); break; + + case PROP_UNIT: + g_value_set_int (value, priv->unit); + break; case PROP_LOWER: g_value_set_double (value, priv->lower); break; @@ -434,41 +436,12 @@ sp_ruler_get_property (GObject *object, case PROP_MAX_SIZE: g_value_set_double (value, priv->max_size); break; - case PROP_METRIC: - g_value_set_enum(value, sp_ruler_get_metric(ruler)); - break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; } } - -/** - * sp_ruler_get_metric: - * @ruler: a #SPRuler - * - * Gets the units used for a #SPRuler. See sp_ruler_set_metric(). - * - * Return value: the units currently used for @ruler - **/ -SPMetric sp_ruler_get_metric(SPRuler *ruler) -{ - g_return_val_if_fail(SP_IS_RULER(ruler), static_cast(0)); - SPRulerPrivate *priv = SP_RULER_GET_PRIVATE (ruler); - - for (size_t i = 0; i < G_N_ELEMENTS(sp_ruler_metrics); i++) { - if (priv->metric == &sp_ruler_metrics[i]) { - return static_cast(i); - } - } - - g_assert_not_reached (); - - return static_cast(0); -} - - static void sp_ruler_realize (GtkWidget *widget) { @@ -1075,6 +1048,44 @@ sp_ruler_remove_track_widget (SPRuler *ruler, ruler); } +/** + * sp_ruler_set_unit: + * @ruler: a #SPRuler + * @unit: the #SPMetric to set the ruler to + * + * This sets the unit of the ruler. + */ +void +sp_ruler_set_unit (SPRuler *ruler, + SPMetric unit) +{ + SPRulerPrivate *priv = SP_RULER_GET_PRIVATE (ruler); + + g_return_if_fail (SP_IS_RULER (ruler)); + + if (priv->unit != unit) + { + priv->unit = unit; + g_object_notify(G_OBJECT(ruler), "unit"); + + gtk_widget_queue_draw (GTK_WIDGET (ruler)); + } +} + +/** + * sp_ruler_get_unit: + * @ruler: a #SPRuler + * + * Return value: the unit currently used in the @ruler widget. + **/ +SPMetric +sp_ruler_get_unit (SPRuler *ruler) +{ + g_return_val_if_fail(SP_IS_RULER(ruler), static_cast(0)); + + return SP_RULER_GET_PRIVATE (ruler)->unit; +} + /** * sp_ruler_set_position: * @ruler: a #SPRuler @@ -1159,6 +1170,8 @@ sp_ruler_draw_ticks (SPRuler *ruler) gint text_size; gint pos; gdouble max_size; + SPMetric unit; + SPRulerMetric ruler_metric = ruler_metric_general; /* The metric to use for this unit system */ PangoLayout *layout; PangoRectangle logical_rect, ink_rect; @@ -1271,19 +1284,32 @@ sp_ruler_draw_ticks (SPRuler *ruler) sprintf (unit_str, "%d", scale); text_size = strlen (unit_str) * digit_height + 1; - for (scale = 0; scale < G_N_ELEMENTS (priv->metric->ruler_scale); scale++) - if (priv->metric->ruler_scale[scale] * fabs (increment) > 2 * text_size) + /* Inkscape change to ruler: Use a 1,2,4,8... scale for inches + * or a 1,2,5,10... scale for everything else */ + if (sp_ruler_get_unit (ruler) == SP_IN) + ruler_metric = ruler_metric_inches; + + for (scale = 0; scale < G_N_ELEMENTS (ruler_metric.ruler_scale); scale++) + if (ruler_metric.ruler_scale[scale] * fabs (increment) > 2 * text_size) break; - if (scale == G_N_ELEMENTS (priv->metric->ruler_scale)) - scale = G_N_ELEMENTS (priv->metric->ruler_scale) - 1; + if (scale == G_N_ELEMENTS (ruler_metric.ruler_scale)) + scale = G_N_ELEMENTS (ruler_metric.ruler_scale) - 1; + + unit = sp_ruler_get_unit (ruler); /* drawing starts here */ length = 0; - for (i = G_N_ELEMENTS (priv->metric->subdivide) - 1; i >= 0; i--) + for (i = G_N_ELEMENTS (ruler_metric.subdivide) - 1; i >= 0; i--) { - gdouble subd_incr = ((gdouble) priv->metric->ruler_scale[scale] / - (gdouble) priv->metric->subdivide[i]); + gdouble subd_incr; + + /* hack to get proper subdivisions at full pixels */ + if (unit == SP_PX && scale == 1 && i == 1) + subd_incr = 1.0; + else + subd_incr = ((gdouble) ruler_metric.ruler_scale[scale] / + (gdouble) ruler_metric.subdivide[i]); if (subd_incr * fabs (increment) <= MINIMUM_INCR) continue; @@ -1345,7 +1371,7 @@ sp_ruler_draw_ticks (SPRuler *ruler) #endif /* draw label */ - double label_spacing_px = fabs((increment*(double)priv->metric->ruler_scale[scale])/priv->metric->subdivide[i]); + double label_spacing_px = fabs(increment*(double)ruler_metric.ruler_scale[scale]/ruler_metric.subdivide[i]); if (i == 0 && (label_spacing_px > 6*digit_height || tick_index%2 == 0 || cur == 0) && (label_spacing_px > 3*digit_height || tick_index%4 == 0 || cur == 0)) @@ -1406,25 +1432,6 @@ out: cairo_destroy (cr); } -void -sp_ruler_set_metric (SPRuler *ruler, - SPMetric metric) -{ - g_return_if_fail(ruler != NULL); - g_return_if_fail(SP_IS_RULER (ruler)); - g_return_if_fail((unsigned) metric < G_N_ELEMENTS(sp_ruler_metrics)); - SPRulerPrivate *priv = SP_RULER_GET_PRIVATE (ruler); - - if (metric == 0) - return; - - priv->metric = const_cast(&sp_ruler_metrics[metric]); - - g_object_notify(G_OBJECT(ruler), "metric"); - - gtk_widget_queue_draw (GTK_WIDGET (ruler)); -} - static PangoLayout* sp_ruler_create_layout (GtkWidget *widget, const gchar *text) -- cgit v1.2.3 From eeab0efb0ec1a2a2a33afb963577dd9a655c29f4 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Mon, 31 Dec 2012 15:20:16 +0000 Subject: GTK+ 3: explicitly set a background colour for rulers Fixed bugs: - https://launchpad.net/bugs/1094511 (bzr r12004) --- src/widgets/ruler.cpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'src/widgets/ruler.cpp') diff --git a/src/widgets/ruler.cpp b/src/widgets/ruler.cpp index ce79b9dac..c1f9be2a5 100644 --- a/src/widgets/ruler.cpp +++ b/src/widgets/ruler.cpp @@ -267,6 +267,20 @@ sp_ruler_init (SPRuler *ruler) priv->max_size = 0; priv->backing_store = NULL; priv->font_scale = DEFAULT_RULER_FONT_SCALE; + +#if GTK_CHECK_VERSION(3,0,0) + const gchar *str = + "SPRuler {\n" + " background-color: @bg_color;\n" + "}\n"; + + 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)), + GTK_STYLE_PROVIDER (css), + GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); + g_object_unref (css); +#endif } static void -- cgit v1.2.3