Filter effects dialog:

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

diff --git a/src/arc-context.cpp b/src/arc-context.cpp
index 7fb4b8fe49f12ed8a995823513782b7de34adf75..4a8d6b9d1c55604b4844d7459c5b456d2a07faaf 100644 (file)
--- a/src/arc-context.cpp
+++ b/src/arc-context.cpp
@@ -31,7 +31,6 @@
 #include "desktop-handles.h"
 #include "snap.h"
 #include "pixmaps/cursor-ellipse.xpm"
-#include "pixmaps/cursor-ellipse.pixbuf"
 #include "sp-metrics.h"
 #include "xml/repr.h"
 #include "xml/node-event-vector.h"
@@ -97,11 +96,6 @@ static void sp_arc_context_init(SPArcContext *arc_context)
     SPEventContext *event_context = SP_EVENT_CONTEXT(arc_context);
 
     event_context->cursor_shape = cursor_ellipse_xpm;
-    event_context->cursor_pixbuf = gdk_pixbuf_new_from_inline(
-            -1,
-            cursor_ellipse_pixbuf,
-            FALSE,
-            NULL);  
     event_context->hot_x = 4;
     event_context->hot_y = 4;
     event_context->xp = 0;
@@ -269,8 +263,9 @@ static gint sp_arc_context_root_handler(SPEventContext *event_context, GdkEvent
                 dragging = true;
                 ac->center = Inkscape::setup_for_drag_start(desktop, event_context, event);
 
-                SnapManager const &m = desktop->namedview->snap_manager;
-                ac->center = m.freeSnap(Inkscape::Snapper::SNAP_POINT, ac->center, ac->item).getPoint();
+                SnapManager const &m = desktop->namedview->snap_manager;                
+                ac->center = m.freeSnap(Inkscape::Snapper::BBOX_POINT | Inkscape::Snapper::SNAP_POINT, ac->center, ac->item).getPoint();
+                
                 sp_canvas_item_grab(SP_CANVAS_ITEM(desktop->acetate),
                                     GDK_KEY_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
                                     GDK_POINTER_MOTION_MASK | GDK_BUTTON_PRESS_MASK,
@@ -279,7 +274,7 @@ static gint sp_arc_context_root_handler(SPEventContext *event_context, GdkEvent
             }
             break;
         case GDK_MOTION_NOTIFY:
-            if (dragging && event->motion.state && GDK_BUTTON1_MASK) {
+            if (dragging && (event->motion.state & GDK_BUTTON1_MASK)) {
 
                 if ( event_context->within_tolerance
                      && ( abs( (gint) event->motion.x - event_context->xp ) < event_context->tolerance )
@@ -292,7 +287,12 @@ static gint sp_arc_context_root_handler(SPEventContext *event_context, GdkEvent
                 event_context->within_tolerance = false;
 
                 NR::Point const motion_w(event->motion.x, event->motion.y);
-                NR::Point const motion_dt(desktop->w2d(motion_w));
+                NR::Point motion_dt(desktop->w2d(motion_w));
+                
+                SnapManager const &m = desktop->namedview->snap_manager;            
+                motion_dt = m.freeSnap(Inkscape::Snapper::BBOX_POINT | Inkscape::Snapper::SNAP_POINT, motion_dt, ac->item).getPoint();
+            
+                
                 sp_arc_drag(ac, motion_dt, event->motion.state);
                 ret = TRUE;
             }
@@ -357,6 +357,21 @@ static gint sp_arc_context_root_handler(SPEventContext *event_context, GdkEvent
                 case GDK_Escape:
                     sp_desktop_selection(desktop)->clear();
                     //TODO: make dragging escapable by Esc
+                    break;
+
+                case GDK_space:
+                    if (dragging) {
+                        sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate),
+                                              event->button.time);
+                        dragging = false;
+                        if (!event_context->within_tolerance) {
+                            // we've been dragging, finish the rect
+                            sp_arc_finish(ac);
+                        }
+                        // do not return true, so that space would work switching to selector
+                    }
+                    break;
+
                 default:
                     break;
             }
@@ -401,7 +416,8 @@ static void sp_arc_drag(SPArcContext *ac, NR::Point pt, guint state)
         }
 
         /* Create object */
-        Inkscape::XML::Node *repr = sp_repr_new("svg:path");
+        Inkscape::XML::Document *xml_doc = sp_document_repr_doc(desktop->doc());
+        Inkscape::XML::Node *repr = xml_doc->createElement("svg:path");
         repr->setAttribute("sodipodi:type", "arc");
 
         /* Set style */