Clear the mssage context after drag filling

[inkscape.git] / src / document.cpp

diff --git a/src/document.cpp b/src/document.cpp
index c6dc66a514cd5675f5eaaf1831c561a648600f3e..a61dffc0b4a1c3fd78d7a9045dc88c51dcc1ab86 100644 (file)
--- a/src/document.cpp
+++ b/src/document.cpp
@@ -118,8 +118,6 @@ SPDocument::~SPDocument() {
     collectOrphans();
 
     if (priv) {
-        inkscape_remove_document(this);
-
         if (priv->partial) {
             sp_repr_free_log(priv->partial);
             priv->partial = NULL;
@@ -279,7 +277,7 @@ sp_document_create(Inkscape::XML::Document *rdoc,
             rnew->setAttribute("id", "base");
         } else {
             // otherwise, take from preferences
-            rnew = r->duplicate();
+            rnew = r->duplicate(rroot->document());
         }
         // insert into the document
         rroot->addChild(rnew, NULL);
@@ -315,7 +313,6 @@ sp_document_create(Inkscape::XML::Document *rdoc,
         document->_selection_changed_connection = Inkscape::NSApplication::Editor::connectSelectionChanged (sigc::mem_fun (*document, &SPDocument::reset_key));
         document->_desktop_activated_connection = Inkscape::NSApplication::Editor::connectDesktopActivated (sigc::mem_fun (*document, &SPDocument::reset_key));
     }
-    inkscape_add_document(document);
 
     return document;
 }
@@ -402,7 +399,6 @@ sp_document_new_from_mem(gchar const *buffer, gint length, unsigned int keepaliv
 
 SPDocument *sp_document_new_dummy() {
     SPDocument *document = new SPDocument();
-    inkscape_add_document(document);
     return document;
 }
 
@@ -1000,6 +996,30 @@ GSList *sp_document_partial_items_in_box(SPDocument *document, unsigned int dkey
     return find_items_in_area(NULL, SP_GROUP(document->root), dkey, box, overlaps);
 }
 
+GSList *
+sp_document_items_at_points(SPDocument *document, unsigned const key, std::vector<NR::Point> points)
+{
+    GSList *items = NULL;
+
+    // When picking along the path, we don't want small objects close together 
+    // (such as hatching strokes) to obscure each other by their deltas, 
+    // so we temporarily set delta to a small value
+    gdouble saved_delta = prefs_get_double_attribute ("options.cursortolerance", "value", 1.0);
+    prefs_set_double_attribute ("options.cursortolerance", "value", 0.25);
+
+    for(unsigned int i = 0; i < points.size(); i++) {
+        SPItem *item = sp_document_item_at_point(document, key, points[i],
+                                         false, NULL);
+        if (item && !g_slist_find(items, item))
+            items = g_slist_prepend (items, item);
+    }
+
+    // and now we restore it back
+    prefs_set_double_attribute ("options.cursortolerance", "value", saved_delta);
+
+    return items;
+}
+
 SPItem *
 sp_document_item_at_point(SPDocument *document, unsigned const key, NR::Point const p,
                           gboolean const into_groups, SPItem *upto)