fix copyright year

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

diff --git a/src/arc-context.cpp b/src/arc-context.cpp
index 0b0aad79e563890d2fcea8120b8a992e920f0593..c682677a69c1c001d39bc423cd9ec79da2dae4cc 100644 (file)
--- a/src/arc-context.cpp
+++ b/src/arc-context.cpp
@@ -8,9 +8,10 @@
  *   Lauris Kaplinski <lauris@kaplinski.com>
  *   bulia byak <buliabyak@users.sf.net>
  *
+ * Copyright (C) 2006      Johan Engelen <johan@shouraizou.nl>
+ * Copyright (C) 2002      Mitsuru Oka
  * Copyright (C) 2000-2002 Lauris Kaplinski
  * Copyright (C) 2000-2001 Ximian, Inc.
- * Copyright (C) 2002 Mitsuru Oka
  *
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
@@ -30,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"
@@ -96,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;
@@ -331,10 +326,12 @@ static gint sp_arc_context_root_handler(SPEventContext *event_context, GdkEvent
                 case GDK_Shift_R:
                 case GDK_Meta_L:  // Meta is when you press Shift+Alt (at least on my machine)
                 case GDK_Meta_R:
-                    sp_event_show_modifier_tip(event_context->defaultMessageContext(), event,
-                                               _("<b>Ctrl</b>: make circle or integer-ratio ellipse, snap arc/segment angle"),
-                                               _("<b>Shift</b>: draw around the starting point"),
-                                               NULL);
+                    if (!dragging) {
+                        sp_event_show_modifier_tip(event_context->defaultMessageContext(), event,
+                                                   _("<b>Ctrl</b>: make circle or integer-ratio ellipse, snap arc/segment angle"),
+                                                   _("<b>Shift</b>: draw around the starting point"),
+                                                   NULL);
+                    }
                     break;
                 case GDK_Up:
                 case GDK_Down:
@@ -398,7 +395,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 */
@@ -408,6 +406,8 @@ static void sp_arc_drag(SPArcContext *ac, NR::Point pt, guint state)
         Inkscape::GC::release(repr);
         ac->item->transform = SP_ITEM(desktop->currentRoot())->getRelativeTransform(desktop->currentLayer());
         ac->item->updateRepr();
+
+        sp_canvas_force_full_redraw_after_interruptions(desktop->canvas, 5);
     }
 
     NR::Rect const r = Inkscape::snap_rectangular_box(desktop, ac->item, pt, ac->center, state);
@@ -432,6 +432,8 @@ static void sp_arc_finish(SPArcContext *ac)
 
         SP_OBJECT(ac->item)->updateRepr();
 
+        sp_canvas_end_forced_full_redraws(desktop->canvas);
+        
         sp_desktop_selection(desktop)->set(ac->item);
         sp_document_done(sp_desktop_document(desktop), SP_VERB_CONTEXT_ARC, 
                          _("Create ellipse"));