index 5c9e45521600c12ac0581e454287b39698b3a44b..985e3ac5153cecf1194f03502a2d4db8bacbdbc5 100644 (file)
--- a/src/dropper-context.cpp
+++ b/src/dropper-context.cpp
#include "color.h"
#include "color-rgba.h"
#include "desktop-style.h"
-#include "prefs-utils.h"
+#include "preferences.h"
#include "sp-namedview.h"
#include "desktop.h"
#include "desktop-handles.h"
#include "dropper-context.h"
#include "message-context.h"
-#include "libnr/nr-scale-translate-ops.h"
+//#include "libnr/nr-scale-translate-ops.h"
static void sp_dropper_context_class_init(SPDropperContextClass *klass);
static void sp_dropper_context_init(SPDropperContext *dc);
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);
- if (prefs_get_int_attribute("tools.dropper", "selcue", 0) != 0) {
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+ if (prefs->getBool("/tools/dropper/selcue")) {
ec->enableSelectionCue();
}
- if (prefs_get_int_attribute("tools.dropper", "gradientdrag", 0) != 0) {
+ if (prefs->getBool("/tools/dropper/gradientdrag")) {
ec->enableGrDrag();
}
}
guint32 sp_dropper_context_get_color(SPEventContext *ec)
{
SPDropperContext *dc = SP_DROPPER_CONTEXT(ec);
-
- int pick = prefs_get_int_attribute("tools.dropper", "pick",
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+
+ int pick = prefs->getInt("/tools/dropper/pick",
SP_DROPPER_PICK_VISIBLE);
- int setalpha = prefs_get_int_attribute("tools.dropper", "setalpha", 1);
-
+ 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);
}
@@ -157,14 +159,15 @@ static gint sp_dropper_context_root_handler(SPEventContext *event_context, GdkEv
SPDropperContext *dc = (SPDropperContext *) event_context;
int ret = FALSE;
SPDesktop *desktop = event_context->desktop;
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
- int pick = prefs_get_int_attribute("tools.dropper", "pick", SP_DROPPER_PICK_VISIBLE);
- int setalpha = prefs_get_int_attribute("tools.dropper", "setalpha", 1);
+ int pick = prefs->getInt("/tools/dropper/pick", SP_DROPPER_PICK_VISIBLE);
+ bool setalpha = prefs->getBool("/tools/dropper/setalpha", true);
switch (event->type) {
case GDK_BUTTON_PRESS:
if (event->button.button == 1 && !event_context->space_panning) {
- dc->centre = NR::Point(event->button.x, event->button.y);
+ dc->centre = Geom::Point(event->button.x, event->button.y);
dc->dragging = TRUE;
ret = TRUE;
}
@@ -184,24 +187,24 @@ static gint sp_dropper_context_root_handler(SPEventContext *event_context, GdkEv
// calculate average
// radius
- rw = std::min(NR::L2(NR::Point(event->button.x, event->button.y) - dc->centre), 400.0);
+ rw = std::min(Geom::L2(Geom::Point(event->button.x, event->button.y) - dc->centre), 400.0);
if (rw == 0) { // happens sometimes, little idea why...
break;
}
- 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) );
+ Geom::Point const cd = desktop->w2d(dc->centre);
+ Geom::Matrix const w2dt = desktop->w2d();
+ const double scale = rw * w2dt.descrim();
+ Geom::Matrix const sm( Geom::Scale(scale, scale) * Geom::Translate(cd) );
sp_canvas_item_affine_absolute(dc->area, sm);
sp_canvas_item_show(dc->area);
/* Get buffer */
- const int x0 = (int) floor(dc->centre[NR::X] - rw);
- const int y0 = (int) floor(dc->centre[NR::Y] - rw);
- const int x1 = (int) ceil(dc->centre[NR::X] + rw);
- const int y1 = (int) ceil(dc->centre[NR::Y] + rw);
+ const int x0 = (int) floor(dc->centre[Geom::X] - rw);
+ const int y0 = (int) floor(dc->centre[Geom::Y] - rw);
+ const int x1 = (int) ceil(dc->centre[Geom::X] + rw);
+ const int y1 = (int) ceil(dc->centre[Geom::Y] + rw);
if ((x1 > x0) && (y1 > y0)) {
NRPixBlock pb;
@@ -211,8 +214,8 @@ static gint sp_dropper_context_root_handler(SPEventContext *event_context, GdkEv
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++) {
- const double dx = x - dc->centre[NR::X];
- const double dy = y - dc->centre[NR::Y];
+ const double dx = x - dc->centre[Geom::X];
+ const double dy = y - dc->centre[Geom::Y];
const double w = exp(-((dx * dx) + (dy * dy)) / (rw * rw));
W += w;
R += w * s[0];
@@ -321,7 +324,7 @@ static gint sp_dropper_context_root_handler(SPEventContext *event_context, GdkEv
if (!(sp_desktop_selection(desktop)->isEmpty())) {
- sp_document_done(sp_desktop_document(desktop), SP_VERB_CONTEXT_DROPPER,
+ sp_document_done(sp_desktop_document(desktop), SP_VERB_CONTEXT_DROPPER,
_("Set picked color"));
}