summaryrefslogtreecommitdiffstats
path: root/src/widgets/ruler.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/widgets/ruler.cpp')
-rw-r--r--src/widgets/ruler.cpp820
1 files changed, 594 insertions, 226 deletions
diff --git a/src/widgets/ruler.cpp b/src/widgets/ruler.cpp
index 77332067e..c1f9be2a5 100644
--- a/src/widgets/ruler.cpp
+++ b/src/widgets/ruler.cpp
@@ -1,5 +1,18 @@
/*
- * 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 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).
+ *
+ * - We abbreviate large numbers in tick-labels (e.g., 10000 -> 10k)
*
* Authors:
* Lauris Kaplinski <lauris@kaplinski.com>
@@ -7,6 +20,7 @@
* bulia byak <buliabyak@users.sf.net>
* Diederik van Lierop <mail@diedenrezi.nl>
* Jon A. Cruz <jon@joncruz.org>
+ * Alex Valavanis <valavanisalex@gmail.com>
*
* Copyright (C) 1999-2011 authors
*
@@ -18,21 +32,37 @@
#include <cstdio>
#include "widget-sizes.h"
-#include "desktop-widget.h"
#include "ruler.h"
#include "unit-constants.h"
#include "round.h"
#include <glibmm/i18n.h>
+#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
-#define ROUND(x) ((int) ((x) + 0.5))
-struct _SPRulerPrivate
+enum {
+ PROP_0,
+ PROP_ORIENTATION,
+ PROP_UNIT,
+ PROP_LOWER,
+ PROP_UPPER,
+ PROP_POSITION,
+ PROP_MAX_SIZE
+};
+
+
+/* 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;
+ SPMetric unit;
gdouble lower;
gdouble upper;
gdouble position;
@@ -40,83 +70,90 @@ struct _SPRulerPrivate
GdkWindow *input_window;
cairo_surface_t *backing_store;
+ PangoLayout *layout;
+ gdouble font_scale;
- SPRulerMetric *metric;
-
- gint slider_size;
gint xsrc;
gint ysrc;
+
+ GList *track_widgets;
+} SPRulerPrivate;
+
+#define SP_RULER_GET_PRIVATE(ruler) \
+ G_TYPE_INSTANCE_GET_PRIVATE (ruler, SP_TYPE_RULER, SPRulerPrivate)
+
+
+struct SPRulerMetric
+{
+ gdouble ruler_scale[16];
+ gint subdivide[5];
};
-enum {
- PROP_0,
- PROP_ORIENTATION,
- PROP_LOWER,
- PROP_UPPER,
- PROP_POSITION,
- PROP_MAX_SIZE,
- PROP_METRIC
+// 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 }
};
-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);
+// 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 }
+};
-#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_dispose (GObject *object);
+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_allocate (GtkWidget *widget,
+ GtkAllocation *allocation);
-static void sp_ruler_get_preferred_height (GtkWidget *widget,
- gint *minimal_height,
- gint *natural_height);
+#if GTK_CHECK_VERSION(3,0,0)
+static void sp_ruler_get_preferred_width (GtkWidget *widget,
+ gint *minimum_width,
+ gint *natural_width);
+
+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,
- cairo_t *cr);
+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);
-
-#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<gchar*>("NONE"), const_cast<gchar*>(""), 1, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }},
- {const_cast<gchar*>("millimeters"), const_cast<gchar*>("mm"), PX_PER_MM, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }},
- {const_cast<gchar*>("centimeters"), const_cast<gchar*>("cm"), PX_PER_CM, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }},
- {const_cast<gchar*>("inches"), const_cast<gchar*>("in"), PX_PER_IN, { 1, 2, 4, 8, 16, 32, 64, 128, 256, 512 }, { 1, 2, 4, 8, 16 }},
- {const_cast<gchar*>("feet"), const_cast<gchar*>("ft"), PX_PER_FT, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }},
- {const_cast<gchar*>("points"), const_cast<gchar*>("pt"), PX_PER_PT, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }},
- {const_cast<gchar*>("picas"), const_cast<gchar*>("pc"), PX_PER_PC, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }},
- {const_cast<gchar*>("pixels"), const_cast<gchar*>("px"), PX_PER_PX, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }},
- {const_cast<gchar*>("meters"), const_cast<gchar*>("m"), PX_PER_M, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }},
-};
+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);
+
+
+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)
@@ -124,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;
@@ -135,19 +173,36 @@ 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<GParamFlags>(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<GParamFlags>(GTK_PARAM_READWRITE)));
+
g_object_class_install_property (object_class,
PROP_LOWER,
g_param_spec_double ("lower",
@@ -187,21 +242,14 @@ sp_ruler_class_init (SPRulerClass *klass)
G_MAXDOUBLE,
0.0,
static_cast<GParamFlags>(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<GParamFlags>(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
@@ -212,16 +260,39 @@ 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->slider_size = 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);
+#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
+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);
}
@@ -314,6 +385,11 @@ sp_ruler_set_property (GObject *object,
priv->orientation = static_cast<GtkOrientation>(g_value_get_enum (value));
gtk_widget_queue_resize (GTK_WIDGET (ruler));
break;
+
+ case PROP_UNIT:
+ sp_ruler_set_unit (ruler, static_cast<SPMetric>(g_value_get_int (value)));
+ break;
+
case PROP_LOWER:
sp_ruler_set_range (ruler,
g_value_get_double (value),
@@ -326,18 +402,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<SPMetric>(g_value_get_enum (value)));
- break;
+
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@@ -358,6 +434,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;
@@ -370,41 +450,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<SPMetric>(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<SPMetric>(i);
- }
- }
-
- g_assert_not_reached ();
-
- return static_cast<SPMetric>(0);
-}
-
-
static void
sp_ruler_realize (GtkWidget *widget)
{
@@ -455,6 +506,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 +544,46 @@ 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_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)
{
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,63 +601,79 @@ 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
}
}
+static void
#if GTK_CHECK_VERSION(3,0,0)
-static void sp_ruler_get_preferred_width(GtkWidget *widget, gint *minimal_width, gint *natural_width)
+sp_ruler_style_updated (GtkWidget *widget)
+#else
+sp_ruler_style_set (GtkWidget *widget,
+ GtkStyle *prev_style)
+#endif
{
- GtkRequisition requisition;
- sp_ruler_size_request(widget, &requisition);
- *minimal_width = *natural_width = requisition.width;
-}
+ SPRulerPrivate *priv = SP_RULER_GET_PRIVATE (widget);
-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;
-}
+#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
-static void
-sp_ruler_size_allocate (GtkWidget *widget,
- GtkAllocation *allocation)
-{
- SPRuler *ruler = SP_RULER(widget);
- SPRulerPrivate *priv = SP_RULER_GET_PRIVATE (ruler);
-
- gtk_widget_set_allocation(widget, allocation);
+ gtk_widget_style_get (widget,
+ "font-scale", &priv->font_scale,
+ NULL);
- if (gtk_widget_get_realized (widget))
+ if (priv->layout)
{
- gdk_window_move_resize (priv->input_window,
- allocation->x, allocation->y,
- allocation->width, allocation->height);
-
- sp_ruler_make_pixmap (ruler);
+ g_object_unref (priv->layout);
+ priv->layout = NULL;
}
}
+#if GTK_CHECK_VERSION(3,0,0)
+static void
+sp_ruler_get_preferred_width (GtkWidget *widget,
+ gint *minimum_width,
+ gint *natural_width)
+{
+ GtkRequisition requisition;
-#if !GTK_CHECK_VERSION(3,0,0)
-static gboolean sp_ruler_expose(GtkWidget *widget,
- GdkEventExpose *event)
+ sp_ruler_size_request (widget, &requisition);
+
+ *minimum_width = *natural_width = requisition.width;
+}
+
+static void
+sp_ruler_get_preferred_height (GtkWidget *widget,
+ gint *minimum_height,
+ gint *natural_height)
+{
+ GtkRequisition requisition;
+
+ sp_ruler_size_request(widget, &requisition);
+
+ *minimum_height = *natural_height = requisition.height;
+}
+#else
+static gboolean
+sp_ruler_expose (GtkWidget *widget,
+ GdkEventExpose *event)
{
cairo_t *cr = gdk_cairo_create(gtk_widget_get_window(widget));
GtkAllocation allocation;
@@ -583,10 +692,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 +709,6 @@ static gboolean sp_ruler_draw(GtkWidget *widget,
return FALSE;
}
-
static void
sp_ruler_make_pixmap (SPRuler *ruler)
{
@@ -621,7 +728,6 @@ sp_ruler_make_pixmap (SPRuler *ruler)
allocation.height);
}
-
static void
sp_ruler_draw_pos (SPRuler *ruler)
{
@@ -765,16 +871,234 @@ sp_ruler_draw_pos (SPRuler *ruler)
}
}
+/**
+ * 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));
+}
+
+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);
+ }
+}
+
+/* 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;
-#define UNUSED_PIXELS 2 // There appear to be two pixels that are not being used at each end of the ruler
+ if (gtk_widget_get_translation_to_window (widget, window, &tx, &ty))
+ {
+ event_x += tx;
+ event_y += ty;
+ }
-GtkWidget* sp_ruler_new(GtkOrientation orientation)
+ *widget_x = event_x;
+ *widget_y = event_y;
+}
+
+static gboolean
+sp_ruler_track_widget_motion_notify (GtkWidget *widget,
+ GdkEventMotion *mevent,
+ SPRuler *ruler)
{
- return GTK_WIDGET(g_object_new(SP_TYPE_RULER,
- "orientation", orientation,
- NULL));
+ gint widget_x;
+ gint widget_y;
+ gint ruler_x;
+ gint ruler_y;
+
+ widget = gtk_get_event_widget (reinterpret_cast<GdkEvent *>(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_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<SPMetric>(0));
+
+ return SP_RULER_GET_PRIVATE (ruler)->unit;
+}
/**
* sp_ruler_set_position:
@@ -820,24 +1144,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;
}
@@ -870,11 +1179,15 @@ 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;
+ SPMetric unit;
+ SPRulerMetric ruler_metric = ruler_metric_general; /* The metric to use for this unit system */
PangoLayout *layout;
+ PangoRectangle logical_rect, ink_rect;
if (! gtk_widget_is_drawable (widget))
return;
@@ -888,24 +1201,29 @@ 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)
{
- width = allocation.width; // in pixels; is apparently 2 pixels shorter than the canvas at each end
- height = allocation.height;
+ width = allocation.width;
+#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);
@@ -961,15 +1279,10 @@ 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;
- 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
@@ -981,23 +1294,36 @@ 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;
- 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;
@@ -1028,7 +1354,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)
@@ -1059,7 +1385,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))
@@ -1072,19 +1398,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,22 +1446,45 @@ out:
cairo_destroy (cr);
}
-
-void sp_ruler_set_metric(SPRuler *ruler, SPMetric metric)
+static PangoLayout*
+sp_ruler_create_layout (GtkWidget *widget,
+ const gchar *text)
{
- 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);
+ SPRulerPrivate *priv = SP_RULER_GET_PRIVATE (widget);
+ PangoLayout *layout;
+ PangoAttrList *attrs;
+ PangoAttribute *attr;
- if (metric == 0)
- return;
+ layout = gtk_widget_create_pango_layout (widget, text);
- priv->metric = const_cast<SPRulerMetric *>(&sp_ruler_metrics[metric]);
+ attrs = pango_attr_list_new ();
- g_object_notify(G_OBJECT(ruler), "metric");
+ attr = pango_attr_scale_new (priv->font_scale);
+ attr->start_index = 0;
+ attr->end_index = -1;
+ pango_attr_list_insert (attrs, attr);
- gtk_widget_queue_draw (GTK_WIDGET (ruler));
+ 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;
}
/*
generated by cgit v1.2.3 (git 2.25.1) at 2026-05-19 23:27:00 +0000