Fix fallback icon loading order for icons with legacy names.

[inkscape.git] / src / dropper-context.cpp

diff --git a/src/dropper-context.cpp b/src/dropper-context.cpp
index 0e30acf1bd002581a4d8c9ea950aee3082bc4284..b7344889ff67836fe81fac969ca6db79a291d001 100644 (file)
--- a/src/dropper-context.cpp
+++ b/src/dropper-context.cpp
@@ -1,11 +1,10 @@
-#define __SP_DROPPER_CONTEXT_C__
-
 /*
  * Tool for picking colors from drawing
  *
  * Authors:
  *   Lauris Kaplinski <lauris@kaplinski.com>
  *   bulia byak <buliabyak@users.sf.net>
+ *   Abhishek Sharma
  *
  * Copyright (C) 1999-2005 Authors
  *
@@ -30,7 +29,7 @@
 #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"
@@ -43,6 +42,8 @@
 #include "message-context.h"
 //#include "libnr/nr-scale-translate-ops.h"
 
+using Inkscape::DocumentUndo;
+
 static void sp_dropper_context_class_init(SPDropperContextClass *klass);
 static void sp_dropper_context_init(SPDropperContext *dc);
 
@@ -114,11 +115,12 @@ static void sp_dropper_context_setup(SPEventContext *ec)
     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();
     }
 }
@@ -128,6 +130,11 @@ static void sp_dropper_context_finish(SPEventContext *ec)
     SPDropperContext *dc = SP_DROPPER_CONTEXT(ec);
 
     ec->enableGrDrag(false);
+       
+    if (dc->grabbed) {
+        sp_canvas_item_ungrab(dc->grabbed, GDK_CURRENT_TIME);
+        dc->grabbed = NULL;
+    }
 
     if (dc->area) {
         gtk_object_destroy(GTK_OBJECT(dc->area));
@@ -136,17 +143,28 @@ static void sp_dropper_context_finish(SPEventContext *ec)
 }
 
 
+/**
+ * Returns the current dropper context icc-color.
+ */
+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.
  */
 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,9 +175,10 @@ 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:
@@ -168,6 +187,12 @@ static gint sp_dropper_context_root_handler(SPEventContext *event_context, GdkEv
                 dc->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);
+                       
             break;
        case GDK_MOTION_NOTIFY:
             if (event->motion.state & GDK_BUTTON2_MASK) {
@@ -308,6 +333,11 @@ static gint sp_dropper_context_root_handler(SPEventContext *event_context, GdkEv
             {
                 sp_canvas_item_hide(dc->area);
                 dc->dragging = FALSE;
+                               
+                               if (dc->grabbed) {
+                                       sp_canvas_item_ungrab(dc->grabbed, event->button.time);
+                                       dc->grabbed = NULL;
+                               }
 
                 double alpha_to_set = setalpha? dc->alpha : 1.0;
 
@@ -321,8 +351,8 @@ 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, 
-                                     _("Set picked color"));
+                    DocumentUndo::done(sp_desktop_document(desktop), SP_VERB_CONTEXT_DROPPER,
+                                       _("Set picked color"));
                 }
 
                 ret = TRUE;