axonomgrid: Bugfix

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

diff --git a/src/node-context.cpp b/src/node-context.cpp
index 6ad2254ce4e5f3a950d6b2452a9ed448186fca74..774e0813e5c4da5ceed8fe565a58ec7e10b7c739 100644 (file)
--- a/src/node-context.cpp
+++ b/src/node-context.cpp
@@ -26,11 +26,9 @@
 #include "desktop-handles.h"
 #include "selection.h"
 #include "pixmaps/cursor-node.xpm"
-#include "pixmaps/cursor-node.pixbuf"
 #include "message-context.h"
 #include "node-context.h"
 #include "pixmaps/cursor-node-d.xpm"
-#include "pixmaps/cursor-node-d.pixbuf"
 #include "prefs-utils.h"
 #include "xml/node-event-vector.h"
 #include "style.h"
@@ -100,11 +98,6 @@ sp_node_context_init(SPNodeContext *node_context)
     SPEventContext *event_context = SP_EVENT_CONTEXT(node_context);
 
     event_context->cursor_shape = cursor_node_xpm;
-    event_context->cursor_pixbuf = gdk_pixbuf_new_from_inline(
-            -1,
-            cursor_node_pixbuf,
-            FALSE,
-            NULL);  
     event_context->hot_x = 1;
     event_context->hot_y = 1;
 
@@ -587,10 +580,12 @@ sp_node_context_root_handler(SPEventContext *event_context, GdkEvent *event)
                     nc->curvepoint_event[NR::Y] = (gint) event->motion.y;
                     gobble_motion_events(GDK_BUTTON1_MASK);
                 } else {
-                    NR::Point const motion_w(event->motion.x,
-                                         event->motion.y);
-                    NR::Point const motion_dt(desktop->w2d(motion_w));
-                    Inkscape::Rubberband::get()->move(motion_dt);
+                    if (Inkscape::Rubberband::get()->is_started()) {
+                        NR::Point const motion_w(event->motion.x,
+                                            event->motion.y);
+                        NR::Point const motion_dt(desktop->w2d(motion_w));
+                        Inkscape::Rubberband::get()->move(motion_dt);
+                    }
                 }
                 nc->drag = TRUE;
                 ret = TRUE;
@@ -608,22 +603,12 @@ sp_node_context_root_handler(SPEventContext *event_context, GdkEvent *event)
 
                 if (nc->cursor_drag && !over_stroke) {
                     event_context->cursor_shape = cursor_node_xpm;
-                    event_context->cursor_pixbuf = gdk_pixbuf_new_from_inline(
-                            -1,
-                            cursor_node_pixbuf,
-                            FALSE,
-                            NULL);  
                     event_context->hot_x = 1;
                     event_context->hot_y = 1;
                     sp_event_context_update_cursor(event_context);
                     nc->cursor_drag = false;
                 } else if (!nc->cursor_drag && over_stroke) {
                     event_context->cursor_shape = cursor_node_d_xpm;
-                    event_context->cursor_pixbuf = gdk_pixbuf_new_from_inline(
-                            -1,
-                            cursor_node_d_pixbuf,
-                            FALSE,
-                            NULL);  
                     event_context->hot_x = 1;
                     event_context->hot_y = 1;
                     sp_event_context_update_cursor(event_context);