From 8f08a6abd400a84ad9461b4517aefb1507d229ed Mon Sep 17 00:00:00 2001 From: John Smith Date: Wed, 5 Sep 2012 13:00:15 +0900 Subject: Fix for 172236 : Dropper in Fill-Stroke dialog, changed to be a one time only pick (bzr r11652) --- src/dropper-context.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/dropper-context.cpp') diff --git a/src/dropper-context.cpp b/src/dropper-context.cpp index ecbcc965b..6ac00887b 100644 --- a/src/dropper-context.cpp +++ b/src/dropper-context.cpp @@ -43,6 +43,7 @@ #include "dropper-context.h" #include "message-context.h" #include "verbs.h" +#include "event-context.h" using Inkscape::DocumentUndo; @@ -323,6 +324,11 @@ static gint sp_dropper_context_root_handler(SPEventContext *event_context, GdkEv _("Set picked color")); } + if (prefs->getBool("/tools/dropper/onetimepick", false)) { + prefs->setBool("/tools/dropper/onetimepick", false); + sp_toggle_dropper(desktop); + } + ret = TRUE; } break; -- cgit v1.2.3 From 370a3f5cc9e39352a081e5d5dd8c43676547a6e6 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 4 Oct 2012 11:45:44 +1000 Subject: code cleanup: add own includes to cpp files or make the functions static if they are not used elsewhere. (bzr r11735) --- src/dropper-context.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/dropper-context.cpp') diff --git a/src/dropper-context.cpp b/src/dropper-context.cpp index 6ac00887b..4742f5cff 100644 --- a/src/dropper-context.cpp +++ b/src/dropper-context.cpp @@ -149,7 +149,7 @@ static void sp_dropper_context_finish(SPEventContext *ec) /** * Returns the current dropper context icc-color. */ -SPColor* sp_dropper_context_get_icc_color(SPEventContext */*ec*/) +static SPColor* sp_dropper_context_get_icc_color(SPEventContext */*ec*/) { //TODO: implement-me! -- cgit v1.2.3 From d6a0a9aad6bc34cb5c2fac14bd6c046b480e85ab Mon Sep 17 00:00:00 2001 From: John Smith Date: Sat, 24 Nov 2012 17:20:08 +0900 Subject: Fix for 172236 : Dropper pixmaps and onetime fix (bzr r11894) --- src/dropper-context.cpp | 105 +++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 87 insertions(+), 18 deletions(-) (limited to 'src/dropper-context.cpp') diff --git a/src/dropper-context.cpp b/src/dropper-context.cpp index 4742f5cff..8b293a9d9 100644 --- a/src/dropper-context.cpp +++ b/src/dropper-context.cpp @@ -32,6 +32,7 @@ #include "desktop-style.h" #include "preferences.h" #include "sp-namedview.h" +#include "sp-cursor.h" #include "desktop.h" #include "desktop-handles.h" #include "selection.h" @@ -39,6 +40,8 @@ #include "document-undo.h" #include "pixmaps/cursor-dropper.xpm" +#include "pixmaps/cursor-dropper-f.xpm" +#include "pixmaps/cursor-dropper-s.xpm" #include "dropper-context.h" #include "message-context.h" @@ -57,6 +60,9 @@ static gint sp_dropper_context_root_handler(SPEventContext *ec, GdkEvent * event static SPEventContextClass *parent_class; +static GdkCursor *cursor_dropper_fill = NULL; +static GdkCursor *cursor_dropper_stroke = NULL; + GType sp_dropper_context_get_type() { static GType type = 0; @@ -90,9 +96,13 @@ static void sp_dropper_context_class_init(SPDropperContextClass *klass) static void sp_dropper_context_init(SPDropperContext *dc) { SPEventContext *event_context = SP_EVENT_CONTEXT(dc); - event_context->cursor_shape = cursor_dropper_xpm; + event_context->cursor_shape = cursor_dropper_f_xpm; event_context->hot_x = 7; event_context->hot_y = 7; + + cursor_dropper_fill = sp_cursor_new_from_xpm(cursor_dropper_f_xpm , 7, 7); + cursor_dropper_stroke = sp_cursor_new_from_xpm(cursor_dropper_s_xpm , 7, 7); + } static void sp_dropper_context_setup(SPEventContext *ec) @@ -143,6 +153,27 @@ static void sp_dropper_context_finish(SPEventContext *ec) sp_canvas_item_destroy(dc->area); dc->area = NULL; } + + if (cursor_dropper_fill) { +#if GTK_CHECK_VERSION(3,0,0) + g_object_unref(cursor_dropper_fill); +#else + gdk_cursor_unref (cursor_dropper_fill); +#endif + cursor_dropper_fill = NULL; + } + if (cursor_dropper_stroke) { +#if GTK_CHECK_VERSION(3,0,0) + g_object_unref(cursor_dropper_stroke); +#else + gdk_cursor_unref (cursor_dropper_stroke); +#endif + cursor_dropper_fill = NULL; + } + + //Inkscape::Preferences *prefs = Inkscape::Preferences::get(); + //prefs->setBool("/tools/dropper/onetimepick", false); + } @@ -205,6 +236,13 @@ static gint sp_dropper_context_root_handler(SPEventContext *event_context, GdkEv } else if (!event_context->space_panning) { // otherwise, constantly calculate color no matter is any button pressed or not + // If one time pick with stroke set the pixmap + if (prefs->getBool("/tools/dropper/onetimepick", false) && prefs->getInt("/dialogs/fillstroke/page", 0) == 1) { + //TODO Only set when not set already + GdkWindow* window = gtk_widget_get_window(GTK_WIDGET(sp_desktop_canvas(desktop))); + gdk_window_set_cursor(window, cursor_dropper_stroke); + } + double rw = 0.0; double R(0), G(0), B(0), A(0); @@ -310,14 +348,24 @@ static gint sp_dropper_context_root_handler(SPEventContext *event_context, GdkEv double alpha_to_set = setalpha? dc->alpha : 1.0; + bool fill = !(event->button.state & GDK_SHIFT_MASK); // Stroke if Shift key held + if (prefs->getBool("/tools/dropper/onetimepick", false)) { + // "One time" pick from Fill/Stroke dialog stroke page, always apply fill or stroke (ignore key) + fill = (prefs->getInt("/dialogs/fillstroke/page", 0) == 0) ? true : false; + } + // do the actual color setting sp_desktop_set_color(desktop, (event->button.state & GDK_MOD1_MASK)? ColorRGBA(1 - dc->R, 1 - dc->G, 1 - dc->B, alpha_to_set) : ColorRGBA(dc->R, dc->G, dc->B, alpha_to_set), - false, !(event->button.state & GDK_SHIFT_MASK)); + false, fill); // REJON: set aux. toolbar input to hex color! + if (event->button.state & GDK_SHIFT_MASK) { + GdkWindow* window = gtk_widget_get_window(GTK_WIDGET(sp_desktop_canvas(desktop))); + gdk_window_set_cursor(window, cursor_dropper_stroke); + } if (!(sp_desktop_selection(desktop)->isEmpty())) { DocumentUndo::done(sp_desktop_document(desktop), SP_VERB_CONTEXT_DROPPER, @@ -332,25 +380,46 @@ static gint sp_dropper_context_root_handler(SPEventContext *event_context, GdkEv ret = TRUE; } break; - case GDK_KEY_PRESS: - switch (get_group0_keyval(&event->key)) { - case GDK_KEY_Up: - case GDK_KEY_Down: - case GDK_KEY_KP_Up: - case GDK_KEY_KP_Down: - // prevent the zoom field from activation - if (!MOD__CTRL_ONLY) { - ret = TRUE; - } - break; - case GDK_KEY_Escape: - sp_desktop_selection(desktop)->clear(); - default: - break; + case GDK_KEY_PRESS: + switch (get_group0_keyval(&event->key)) { + case GDK_KEY_Up: + case GDK_KEY_Down: + case GDK_KEY_KP_Up: + case GDK_KEY_KP_Down: + // prevent the zoom field from activation + if (!MOD__CTRL_ONLY) { + ret = TRUE; } break; - default: + case GDK_KEY_Escape: + sp_desktop_selection(desktop)->clear(); + case GDK_KEY_Shift_L: + case GDK_KEY_Shift_R: + if (!desktop->isWaitingCursor() && !prefs->getBool("/tools/dropper/onetimepick", false)) { + GdkWindow* window = gtk_widget_get_window(GTK_WIDGET(sp_desktop_canvas(desktop))); + gdk_window_set_cursor(window, cursor_dropper_stroke); + } + break; + default: + break; + } + break; + case GDK_KEY_RELEASE: + switch (get_group0_keyval(&event->key)) { + case GDK_KEY_Shift_L: + case GDK_KEY_Shift_R: + if (!desktop->isWaitingCursor() && !prefs->getBool("/tools/dropper/onetimepick", false)) { + GdkWindow* window = gtk_widget_get_window(GTK_WIDGET(sp_desktop_canvas(desktop))); + gdk_window_set_cursor(window, cursor_dropper_fill); + } + break; + default: + break; + } + break; + default: + break; } if (!ret) { -- cgit v1.2.3 From 4cff9f1b30d110eba814d9adc0689fa073c79157 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Mon, 31 Dec 2012 12:20:39 +0000 Subject: Replace C-style pointer casts in event contexts (bzr r12001) --- src/dropper-context.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/dropper-context.cpp') diff --git a/src/dropper-context.cpp b/src/dropper-context.cpp index 8b293a9d9..38b981444 100644 --- a/src/dropper-context.cpp +++ b/src/dropper-context.cpp @@ -84,9 +84,9 @@ GType sp_dropper_context_get_type() static void sp_dropper_context_class_init(SPDropperContextClass *klass) { - SPEventContextClass *ec_class = (SPEventContextClass *) klass; + SPEventContextClass *ec_class = SP_EVENT_CONTEXT_CLASS(klass); - parent_class = (SPEventContextClass*)g_type_class_peek_parent(klass); + parent_class = SP_EVENT_CONTEXT_CLASS(g_type_class_peek_parent(klass)); ec_class->setup = sp_dropper_context_setup; ec_class->finish = sp_dropper_context_finish; @@ -109,8 +109,8 @@ static void sp_dropper_context_setup(SPEventContext *ec) { SPDropperContext *dc = SP_DROPPER_CONTEXT(ec); - if (((SPEventContextClass *) parent_class)->setup) { - ((SPEventContextClass *) parent_class)->setup(ec); + if ((SP_EVENT_CONTEXT_CLASS(parent_class))->setup) { + (SP_EVENT_CONTEXT_CLASS(parent_class))->setup(ec); } /* TODO: have a look at sp_dyna_draw_context_setup where the same is done.. generalize? at least make it an arcto! */ @@ -206,7 +206,7 @@ guint32 sp_dropper_context_get_color(SPEventContext *ec) static gint sp_dropper_context_root_handler(SPEventContext *event_context, GdkEvent *event) { - SPDropperContext *dc = (SPDropperContext *) event_context; + SPDropperContext *dc = SP_DROPPER_CONTEXT(event_context); int ret = FALSE; SPDesktop *desktop = event_context->desktop; Inkscape::Preferences *prefs = Inkscape::Preferences::get(); @@ -423,8 +423,8 @@ static gint sp_dropper_context_root_handler(SPEventContext *event_context, GdkEv } if (!ret) { - if (((SPEventContextClass *) parent_class)->root_handler) { - ret = ((SPEventContextClass *) parent_class)->root_handler(event_context, event); + if ((SP_EVENT_CONTEXT_CLASS(parent_class))->root_handler) { + ret = (SP_EVENT_CONTEXT_CLASS(parent_class))->root_handler(event_context, event); } } -- cgit v1.2.3 From cfe9c94712a2ff6849b123672e51b603f20e76ae Mon Sep 17 00:00:00 2001 From: "Jon A. Cruz" Date: Thu, 10 Jan 2013 23:30:09 -0800 Subject: Warning and dead code cleanup. (bzr r12014) --- src/dropper-context.cpp | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'src/dropper-context.cpp') diff --git a/src/dropper-context.cpp b/src/dropper-context.cpp index 38b981444..2be112706 100644 --- a/src/dropper-context.cpp +++ b/src/dropper-context.cpp @@ -177,16 +177,6 @@ static void sp_dropper_context_finish(SPEventContext *ec) } -/** - * Returns the current dropper context icc-color. - */ -static SPColor* sp_dropper_context_get_icc_color(SPEventContext */*ec*/) -{ - //TODO: implement-me! - - return 0; // At least we will cause a clean crash, instead of random corruption. -} - /** * Returns the current dropper context color. */ -- cgit v1.2.3 From 0fc36cf61dcf46ef4f190feba6a37af22eb6fa34 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Wed, 16 Jan 2013 11:43:52 +0000 Subject: Cleanup SPDropperContext: * Use G_DEFINE_TYPE rather than explicit _get_type function * Hide private members (bzr r12031) --- src/dropper-context.cpp | 154 ++++++++++++++++++++++++++---------------------- 1 file changed, 85 insertions(+), 69 deletions(-) (limited to 'src/dropper-context.cpp') diff --git a/src/dropper-context.cpp b/src/dropper-context.cpp index 2be112706..66dcf4ab9 100644 --- a/src/dropper-context.cpp +++ b/src/dropper-context.cpp @@ -50,6 +50,23 @@ using Inkscape::DocumentUndo; +typedef struct +{ + double R; + double G; + double B; + double alpha; + + unsigned int dragging : 1; + + SPCanvasItem *grabbed; + SPCanvasItem *area; + Geom::Point centre; +} SPDropperContextPrivate; + +#define SP_DROPPER_CONTEXT_GET_PRIVATE(dc) \ + G_TYPE_INSTANCE_GET_PRIVATE(dc, SP_TYPE_DROPPER_CONTEXT, SPDropperContextPrivate) + static void sp_dropper_context_class_init(SPDropperContextClass *klass); static void sp_dropper_context_init(SPDropperContext *dc); @@ -63,34 +80,21 @@ static SPEventContextClass *parent_class; static GdkCursor *cursor_dropper_fill = NULL; static GdkCursor *cursor_dropper_stroke = NULL; -GType sp_dropper_context_get_type() -{ - static GType type = 0; - if (!type) { - GTypeInfo info = { - sizeof(SPDropperContextClass), - NULL, NULL, - (GClassInitFunc) sp_dropper_context_class_init, - NULL, NULL, - sizeof(SPDropperContext), - 4, - (GInstanceInitFunc) sp_dropper_context_init, - NULL, /* value_table */ - }; - type = g_type_register_static(SP_TYPE_EVENT_CONTEXT, "SPDropperContext", &info, (GTypeFlags) 0); - } - return type; -} +G_DEFINE_TYPE(SPDropperContext, sp_dropper_context, SP_TYPE_EVENT_CONTEXT); -static void sp_dropper_context_class_init(SPDropperContextClass *klass) +static void +sp_dropper_context_class_init(SPDropperContextClass *klass) { - SPEventContextClass *ec_class = SP_EVENT_CONTEXT_CLASS(klass); + GObjectClass *object_class = G_OBJECT_CLASS (klass); + SPEventContextClass *ec_class = SP_EVENT_CONTEXT_CLASS(klass); parent_class = SP_EVENT_CONTEXT_CLASS(g_type_class_peek_parent(klass)); ec_class->setup = sp_dropper_context_setup; ec_class->finish = sp_dropper_context_finish; ec_class->root_handler = sp_dropper_context_root_handler; + + g_type_class_add_private(object_class, sizeof(SPDropperContext)); } static void sp_dropper_context_init(SPDropperContext *dc) @@ -105,9 +109,11 @@ static void sp_dropper_context_init(SPDropperContext *dc) } -static void sp_dropper_context_setup(SPEventContext *ec) +static void +sp_dropper_context_setup(SPEventContext *ec) { - SPDropperContext *dc = SP_DROPPER_CONTEXT(ec); + SPDropperContext *dc = SP_DROPPER_CONTEXT(ec); + SPDropperContextPrivate *priv = SP_DROPPER_CONTEXT_GET_PRIVATE(dc); if ((SP_EVENT_CONTEXT_CLASS(parent_class))->setup) { (SP_EVENT_CONTEXT_CLASS(parent_class))->setup(ec); @@ -122,11 +128,11 @@ static void sp_dropper_context_setup(SPEventContext *ec) c->curveto(1, -C1, C1, -1, 0, -1 ); c->curveto(-C1, -1, -1, -C1, -1, 0 ); c->closepath(); - dc->area = sp_canvas_bpath_new(sp_desktop_controls(ec->desktop), c); + priv->area = sp_canvas_bpath_new(sp_desktop_controls(ec->desktop), c); c->unref(); - sp_canvas_bpath_set_fill(SP_CANVAS_BPATH(dc->area), 0x00000000,(SPWindRule)0); - sp_canvas_bpath_set_stroke(SP_CANVAS_BPATH(dc->area), 0x0000007f, 1.0, SP_STROKE_LINEJOIN_MITER, SP_STROKE_LINECAP_BUTT); - sp_canvas_item_hide(dc->area); + sp_canvas_bpath_set_fill(SP_CANVAS_BPATH(priv->area), 0x00000000,(SPWindRule)0); + sp_canvas_bpath_set_stroke(SP_CANVAS_BPATH(priv->area), 0x0000007f, 1.0, SP_STROKE_LINEJOIN_MITER, SP_STROKE_LINECAP_BUTT); + sp_canvas_item_hide(priv->area); Inkscape::Preferences *prefs = Inkscape::Preferences::get(); if (prefs->getBool("/tools/dropper/selcue")) { @@ -138,20 +144,22 @@ static void sp_dropper_context_setup(SPEventContext *ec) } } -static void sp_dropper_context_finish(SPEventContext *ec) +static void +sp_dropper_context_finish(SPEventContext *ec) { - SPDropperContext *dc = SP_DROPPER_CONTEXT(ec); + SPDropperContext *dc = SP_DROPPER_CONTEXT(ec); + SPDropperContextPrivate *priv = SP_DROPPER_CONTEXT_GET_PRIVATE(dc); ec->enableGrDrag(false); - if (dc->grabbed) { - sp_canvas_item_ungrab(dc->grabbed, GDK_CURRENT_TIME); - dc->grabbed = NULL; + if (priv->grabbed) { + sp_canvas_item_ungrab(priv->grabbed, GDK_CURRENT_TIME); + priv->grabbed = NULL; } - if (dc->area) { - sp_canvas_item_destroy(dc->area); - dc->area = NULL; + if (priv->area) { + sp_canvas_item_destroy(priv->area); + priv->area = NULL; } if (cursor_dropper_fill) { @@ -176,30 +184,38 @@ static void sp_dropper_context_finish(SPEventContext *ec) } - /** * Returns the current dropper context color. */ -guint32 sp_dropper_context_get_color(SPEventContext *ec) +guint32 +sp_dropper_context_get_color(SPEventContext *ec) { - SPDropperContext *dc = SP_DROPPER_CONTEXT(ec); - Inkscape::Preferences *prefs = Inkscape::Preferences::get(); + SPDropperContext *dc = SP_DROPPER_CONTEXT(ec); + SPDropperContextPrivate *priv = SP_DROPPER_CONTEXT_GET_PRIVATE(dc); + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); int pick = prefs->getInt("/tools/dropper/pick", - SP_DROPPER_PICK_VISIBLE); + SP_DROPPER_PICK_VISIBLE); + bool setalpha = prefs->getBool("/tools/dropper/setalpha", true); - return SP_RGBA32_F_COMPOSE(dc->R, dc->G, dc->B, - (pick == SP_DROPPER_PICK_ACTUAL && setalpha) ? dc->alpha : 1.0); + return SP_RGBA32_F_COMPOSE(priv->R, + priv->G, + priv->B, + (pick == SP_DROPPER_PICK_ACTUAL && setalpha) ? priv->alpha + : 1.0); } - -static gint sp_dropper_context_root_handler(SPEventContext *event_context, GdkEvent *event) +static gint +sp_dropper_context_root_handler(SPEventContext *event_context, + GdkEvent *event) { - SPDropperContext *dc = SP_DROPPER_CONTEXT(event_context); + SPDropperContext *dc = SP_DROPPER_CONTEXT(event_context); + SPDropperContextPrivate *priv = SP_DROPPER_CONTEXT_GET_PRIVATE(dc); + SPDesktop *desktop = event_context->desktop; + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); + int ret = FALSE; - SPDesktop *desktop = event_context->desktop; - Inkscape::Preferences *prefs = Inkscape::Preferences::get(); int pick = prefs->getInt("/tools/dropper/pick", SP_DROPPER_PICK_VISIBLE); bool setalpha = prefs->getBool("/tools/dropper/setalpha", true); @@ -207,15 +223,15 @@ static gint sp_dropper_context_root_handler(SPEventContext *event_context, GdkEv switch (event->type) { case GDK_BUTTON_PRESS: if (event->button.button == 1 && !event_context->space_panning) { - dc->centre = Geom::Point(event->button.x, event->button.y); - dc->dragging = TRUE; + priv->centre = Geom::Point(event->button.x, event->button.y); + priv->dragging = TRUE; ret = TRUE; } sp_canvas_item_grab(SP_CANVAS_ITEM(desktop->acetate), GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK, NULL, event->button.time); - dc->grabbed = SP_CANVAS_ITEM(desktop->acetate); + priv->grabbed = SP_CANVAS_ITEM(desktop->acetate); break; case GDK_MOTION_NOTIFY: @@ -236,25 +252,25 @@ static gint sp_dropper_context_root_handler(SPEventContext *event_context, GdkEv double rw = 0.0; double R(0), G(0), B(0), A(0); - if (dc->dragging) { + if (priv->dragging) { // calculate average // radius - rw = std::min(Geom::L2(Geom::Point(event->button.x, event->button.y) - dc->centre), 400.0); + rw = std::min(Geom::L2(Geom::Point(event->button.x, event->button.y) - priv->centre), 400.0); if (rw == 0) { // happens sometimes, little idea why... break; } - Geom::Point const cd = desktop->w2d(dc->centre); + Geom::Point const cd = desktop->w2d(priv->centre); Geom::Affine const w2dt = desktop->w2d(); const double scale = rw * w2dt.descrim(); Geom::Affine const sm( Geom::Scale(scale, scale) * Geom::Translate(cd) ); - sp_canvas_item_affine_absolute(dc->area, sm); - sp_canvas_item_show(dc->area); + sp_canvas_item_affine_absolute(priv->area, sm); + sp_canvas_item_show(priv->area); /* Get buffer */ - Geom::Rect r(dc->centre, dc->centre); + Geom::Rect r(priv->centre, priv->centre); r.expandBy(rw); if (!r.hasZeroArea()) { Geom::IntRect area = r.roundOutwards(); @@ -293,13 +309,13 @@ static gint sp_dropper_context_root_handler(SPEventContext *event_context, GdkEv } // remember color - dc->R = R; - dc->G = G; - dc->B = B; - dc->alpha = A; + priv->R = R; + priv->G = G; + priv->B = B; + priv->alpha = A; // status message - double alpha_to_set = setalpha? dc->alpha : 1.0; + double alpha_to_set = setalpha? priv->alpha : 1.0; guint32 c32 = SP_RGBA32_F_COMPOSE(R, G, B, alpha_to_set); gchar c[64]; @@ -309,9 +325,9 @@ static gint sp_dropper_context_root_handler(SPEventContext *event_context, GdkEv // locale-sensitive printf is OK, since this goes to the UI, not into SVG gchar *alpha = g_strdup_printf(_(" alpha %.3g"), alpha_to_set); // where the color is picked, to show in the statusbar - gchar *where = dc->dragging ? g_strdup_printf(_(", averaged with radius %d"), (int) rw) : g_strdup_printf(_(" under cursor")); + gchar *where = priv->dragging ? g_strdup_printf(_(", averaged with radius %d"), (int) rw) : g_strdup_printf(_(" under cursor")); // message, to show in the statusbar - const gchar *message = dc->dragging ? _("Release mouse to set color.") : _("Click to set fill, Shift+click to set stroke; drag to average color in area; with Alt to pick inverse color; Ctrl+C to copy the color under mouse to clipboard"); + const gchar *message = priv->dragging ? _("Release mouse to set color.") : _("Click to set fill, Shift+click to set stroke; drag to average color in area; with Alt to pick inverse color; Ctrl+C to copy the color under mouse to clipboard"); event_context->defaultMessageContext()->setF( Inkscape::NORMAL_MESSAGE, "%s%s%s. %s", c, @@ -328,15 +344,15 @@ static gint sp_dropper_context_root_handler(SPEventContext *event_context, GdkEv case GDK_BUTTON_RELEASE: if (event->button.button == 1 && !event_context->space_panning) { - sp_canvas_item_hide(dc->area); - dc->dragging = FALSE; + sp_canvas_item_hide(priv->area); + priv->dragging = FALSE; - if (dc->grabbed) { - sp_canvas_item_ungrab(dc->grabbed, event->button.time); - dc->grabbed = NULL; + if (priv->grabbed) { + sp_canvas_item_ungrab(priv->grabbed, event->button.time); + priv->grabbed = NULL; } - double alpha_to_set = setalpha? dc->alpha : 1.0; + double alpha_to_set = setalpha? priv->alpha : 1.0; bool fill = !(event->button.state & GDK_SHIFT_MASK); // Stroke if Shift key held if (prefs->getBool("/tools/dropper/onetimepick", false)) { @@ -347,7 +363,7 @@ static gint sp_dropper_context_root_handler(SPEventContext *event_context, GdkEv // do the actual color setting sp_desktop_set_color(desktop, (event->button.state & GDK_MOD1_MASK)? - ColorRGBA(1 - dc->R, 1 - dc->G, 1 - dc->B, alpha_to_set) : ColorRGBA(dc->R, dc->G, dc->B, alpha_to_set), + ColorRGBA(1 - priv->R, 1 - priv->G, 1 - priv->B, alpha_to_set) : ColorRGBA(priv->R, priv->G, priv->B, alpha_to_set), false, fill); // REJON: set aux. toolbar input to hex color! -- cgit v1.2.3 From 4a4cafd45b5f7ccc2151263e3f05a9331bcb7bb4 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Fri, 15 Mar 2013 19:25:30 +0000 Subject: Drop a couple of unused variables and a pixmap (bzr r12210) --- src/dropper-context.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'src/dropper-context.cpp') diff --git a/src/dropper-context.cpp b/src/dropper-context.cpp index 66dcf4ab9..d41e4059d 100644 --- a/src/dropper-context.cpp +++ b/src/dropper-context.cpp @@ -39,7 +39,6 @@ #include "document.h" #include "document-undo.h" -#include "pixmaps/cursor-dropper.xpm" #include "pixmaps/cursor-dropper-f.xpm" #include "pixmaps/cursor-dropper-s.xpm" -- cgit v1.2.3 From d6b24c1540e9a7f388dd1500c762f73586119280 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Tue, 26 Mar 2013 23:46:08 +0000 Subject: Stop using top-level glibmm header (bzr r12251) --- src/dropper-context.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'src/dropper-context.cpp') diff --git a/src/dropper-context.cpp b/src/dropper-context.cpp index d41e4059d..05d22017e 100644 --- a/src/dropper-context.cpp +++ b/src/dropper-context.cpp @@ -15,7 +15,6 @@ # include #endif -#include #include #include #include -- cgit v1.2.3