![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index fbe1bd6ce9449f52cd882ad22ec92f18ad5e232a..66e8a40fbc79acb572dbdf10ecdd5d2814d282b7 100644 (file)
--- a/src/dropper-context.cpp
+++ b/src/dropper-context.cpp
((SPEventContextClass *) parent_class)->setup(ec);
}
- SPCurve *c = sp_curve_new_from_static_bpath(spdc_circle);
- dc->area = sp_canvas_bpath_new(SP_DT_CONTROLS(ec->desktop), c);
+ SPCurve *c = sp_curve_new_from_foreign_bpath(spdc_circle);
+ dc->area = sp_canvas_bpath_new(sp_desktop_controls(ec->desktop), c);
sp_curve_unref(c);
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);
int pick = prefs_get_int_attribute("tools.dropper", "pick",
SP_DROPPER_PICK_VISIBLE);
+ int setalpha = prefs_get_int_attribute("tools.dropper", "setalpha", 1);
+
gchar c[64];
g_snprintf(c, 64, "%06x%02x", c32 >> 8,
- pick == SP_DROPPER_PICK_ACTUAL? SP_COLOR_F_TO_U(dc->alpha) : 255);
+ (pick == SP_DROPPER_PICK_ACTUAL && setalpha)? SP_COLOR_F_TO_U(dc->alpha) : 255);
Glib::ustring text;
text += c;
}
-static gint sp_dropper_context_root_handler(SPEventContext *ec, GdkEvent *event)
+static gint sp_dropper_context_root_handler(SPEventContext *event_context, GdkEvent *event)
{
- SPDropperContext *dc = (SPDropperContext *) ec;
+ SPDropperContext *dc = (SPDropperContext *) event_context;
int ret = FALSE;
+ SPDesktop *desktop = event_context->desktop;
int pick = prefs_get_int_attribute("tools.dropper", "pick", SP_DROPPER_PICK_VISIBLE);
+ int setalpha = prefs_get_int_attribute("tools.dropper", "setalpha", 1);
switch (event->type) {
case GDK_BUTTON_PRESS:
- if (event->button.button == 1) {
+ if (event->button.button == 1 && !event_context->space_panning) {
dc->centre = NR::Point(event->button.x, event->button.y);
dc->dragging = TRUE;
ret = TRUE;
@@ -235,7 +239,7 @@ static gint sp_dropper_context_root_handler(SPEventContext *ec, GdkEvent *event)
// pass on middle-drag
ret = FALSE;
break;
- } else {
+ } else if (!event_context->space_panning) {
// otherwise, constantly calculate color no matter is any button pressed or not
double rw = 0.0;
@@ -251,9 +255,9 @@ static gint sp_dropper_context_root_handler(SPEventContext *ec, GdkEvent *event)
break;
}
- NR::Point const cd = ec->desktop->w2d(dc->centre);
- NR::Matrix const w2dt = ec->desktop->w2d();
- const double scale = rw * NR_MATRIX_DF_EXPANSION(&w2dt);
+ NR::Point const cd = desktop->w2d(dc->centre);
+ NR::Matrix const w2dt = desktop->w2d();
+ const double scale = rw * NR::expansion(w2dt);
NR::Matrix const sm( NR::scale(scale, scale) * NR::translate(cd) );
sp_canvas_item_affine_absolute(dc->area, sm);
sp_canvas_item_show(dc->area);
@@ -268,7 +272,7 @@ static gint sp_dropper_context_root_handler(SPEventContext *ec, GdkEvent *event)
NRPixBlock pb;
nr_pixblock_setup_fast(&pb, NR_PIXBLOCK_MODE_R8G8B8A8P, x0, y0, x1, y1, TRUE);
/* fixme: (Lauris) */
- sp_canvas_arena_render_pixblock(SP_CANVAS_ARENA(SP_DT_DRAWING(ec->desktop)), &pb);
+ sp_canvas_arena_render_pixblock(SP_CANVAS_ARENA(sp_desktop_drawing(desktop)), &pb);
for (int y = y0; y < y1; y++) {
const unsigned char *s = NR_PIXBLOCK_PX(&pb) + (y - y0) * pb.rs;
for (int x = x0; x < x1; x++) {
@@ -302,7 +306,7 @@ static gint sp_dropper_context_root_handler(SPEventContext *ec, GdkEvent *event)
int x = (int) floor(event->button.x);
int y = (int) floor(event->button.y);
nr_pixblock_setup_fast(&pb, NR_PIXBLOCK_MODE_R8G8B8A8P, x, y, x+1, y+1, TRUE);
- sp_canvas_arena_render_pixblock(SP_CANVAS_ARENA(SP_DT_DRAWING(ec->desktop)), &pb);
+ sp_canvas_arena_render_pixblock(SP_CANVAS_ARENA(sp_desktop_drawing(desktop)), &pb);
const unsigned char *s = NR_PIXBLOCK_PX(&pb);
R = s[0] / 255.0;
@@ -313,7 +317,7 @@ static gint sp_dropper_context_root_handler(SPEventContext *ec, GdkEvent *event)
if (pick == SP_DROPPER_PICK_VISIBLE) {
// compose with page color
- guint32 bg = SP_DT_NAMEDVIEW(ec->desktop)->pagecolor;
+ guint32 bg = sp_desktop_namedview(desktop)->pagecolor;
R = R + (SP_RGBA32_R_F(bg)) * (1 - A);
G = G + (SP_RGBA32_G_F(bg)) * (1 - A);
B = B + (SP_RGBA32_B_F(bg)) * (1 - A);
@@ -338,19 +342,20 @@ static gint sp_dropper_context_root_handler(SPEventContext *ec, GdkEvent *event)
dc->alpha = A;
// status message
- guint32 c32 = SP_RGBA32_F_COMPOSE(R, G, B, A);
+ double alpha_to_set = setalpha? dc->alpha : 1.0;
+ guint32 c32 = SP_RGBA32_F_COMPOSE(R, G, B, alpha_to_set);
gchar c[64];
- sp_svg_write_color(c, 64, c32);
+ sp_svg_write_color(c, sizeof(c), c32);
// alpha of color under cursor, to show in the statusbar
// locale-sensitive printf is OK, since this goes to the UI, not into SVG
- gchar *alpha = g_strdup_printf(_(" alpha %.3g"), A);
+ 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"));
// message, to show in the statusbar
const gchar *message = dc->dragging ? _("<b>Release mouse</b> to set color.") : _("<b>Click</b> to set fill, <b>Shift+click</b> to set stroke; <b>drag</b> to average color in area; with <b>Alt</b> to pick inverse color; <b>Ctrl+C</b> to copy the color under mouse to clipboard");
- ec->defaultMessageContext()->setF(
+ event_context->defaultMessageContext()->setF(
Inkscape::NORMAL_MESSAGE,
"<b>%s%s</b>%s. %s", c,
(pick == SP_DROPPER_PICK_VISIBLE)? "" : alpha,
@@ -364,22 +369,25 @@ static gint sp_dropper_context_root_handler(SPEventContext *ec, GdkEvent *event)
}
break;
case GDK_BUTTON_RELEASE:
- if (event->button.button == 1)
+ if (event->button.button == 1 && !event_context->space_panning)
{
sp_canvas_item_hide(dc->area);
dc->dragging = FALSE;
+ double alpha_to_set = setalpha? dc->alpha : 1.0;
+
// do the actual color setting
- sp_desktop_set_color(ec->desktop,
+ sp_desktop_set_color(desktop,
(event->button.state & GDK_MOD1_MASK)?
- ColorRGBA(1 - dc->R, 1 - dc->G, 1 - dc->B, dc->alpha) : ColorRGBA(dc->R, dc->G, dc->B, dc->alpha),
+ 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));
// REJON: set aux. toolbar input to hex color!
- if (!(SP_DT_SELECTION(ec->desktop)->isEmpty())) {
- sp_document_done(SP_DT_DOCUMENT(ec->desktop));
+ if (!(sp_desktop_selection(desktop)->isEmpty())) {
+ sp_document_done(sp_desktop_document(desktop), SP_VERB_CONTEXT_DROPPER,
+ _("Set picked color"));
}
ret = TRUE;
@@ -397,7 +405,7 @@ static gint sp_dropper_context_root_handler(SPEventContext *ec, GdkEvent *event)
}
break;
case GDK_Escape:
- SP_DT_SELECTION(ec->desktop)->clear();
+ sp_desktop_selection(desktop)->clear();
default:
break;
}
@@ -408,7 +416,7 @@ static gint sp_dropper_context_root_handler(SPEventContext *ec, GdkEvent *event)
if (!ret) {
if (((SPEventContextClass *) parent_class)->root_handler) {
- ret = ((SPEventContextClass *) parent_class)->root_handler(ec, event);
+ ret = ((SPEventContextClass *) parent_class)->root_handler(event_context, event);
}
}