update to trunk

(bzr r13645.1.93)

2 files changed, 24 insertions, 28 deletions

diff --git a/src/sp-item.cpp b/src/sp-item.cpp
index 8c99e9bcf..5445be947 100644
--- a/src/sp-item.cpp
+++ b/src/sp-item.cpp
@@ -349,17 +349,11 @@ void SPItem::lowerToBottom() {
     using Inkscape::Util::MutableList;
     using Inkscape::Util::reverse_list;
 
-    MutableList<SPObject &> bottom=find_last_if(
-        reverse_list<SPObject::SiblingIterator>(
-            parent->firstChild(), this
-        ),
-        MutableList<SPObject &>(),
-        &is_item
-    );
+    SPObject * bottom=parent->firstChild();
+    while(dynamic_cast<SPObject*>(bottom) && dynamic_cast<SPObject*>(bottom->next) && bottom!=this && !is_item(*(bottom->next))) bottom=bottom->next;
     if (bottom) {
-        ++bottom;
         Inkscape::XML::Node *ref = ( bottom ? bottom->getRepr() : NULL );
-        getRepr()->parent()->changeOrder(getRepr(), ref);
+        parent->getRepr()->changeOrder(getRepr(), ref);
     }
 }
 
@@ -367,20 +361,20 @@ void SPItem::moveTo(SPItem *target, bool intoafter) {
 
     Inkscape::XML::Node *target_ref = ( target ? target->getRepr() : NULL );
     Inkscape::XML::Node *our_ref = getRepr();
-    gboolean first = FALSE;
-
-    if (target_ref == our_ref) {
-        // Move to ourself ignore
-        return;
-    }
 
     if (!target_ref) {
         // Assume move to the "first" in the top node, find the top node
-        target_ref = our_ref;
-        while (target_ref->parent() != target_ref->root()) {
-            target_ref = target_ref->parent();
+        intoafter = false;
+        SPObject* bottom = this->document->getObjectByRepr(our_ref->root())->firstChild();
+        while(!dynamic_cast<SPItem*>(bottom->next)){
+        	bottom=bottom->next;
         }
-        first = TRUE;
+        target_ref = bottom->getRepr();
+    }
+
+    if (target_ref == our_ref) {
+        // Move to ourself ignore
+        return;
     }
 
     if (intoafter) {
@@ -391,16 +385,10 @@ void SPItem::moveTo(SPItem *target, bool intoafter) {
         // Change in parent, need to remove and add
         our_ref->parent()->removeChild(our_ref);
         target_ref->parent()->addChild(our_ref, target_ref);
-    } else if (!first) {
+    } else {
         // Same parent, just move
         our_ref->parent()->changeOrder(our_ref, target_ref);
     }
-
-    if (first && parent) {
-        // If "first" ensure it appears after the defs etc
-        lowerToBottom();
-        return;
-    }
 }
 
 void SPItem::build(SPDocument *document, Inkscape::XML::Node *repr) {
diff --git a/src/ui/dialog/layers.cpp b/src/ui/dialog/layers.cpp
index 65351cb68..c6888386f 100644
--- a/src/ui/dialog/layers.cpp
+++ b/src/ui/dialog/layers.cpp
@@ -713,13 +713,21 @@ bool LayersPanel::_handleDragDrop(const Glib::RefPtr<Gdk::DragContext>& /*contex
  */
 void LayersPanel::_doTreeMove( )
 {
-    if (_dnd_source ) {
+    if (_dnd_source &&  _dnd_source->getRepr() ) {
+        if(!_dnd_target){
+            _dnd_source->doWriteTransform(_dnd_source->getRepr(), _dnd_source->document->getRoot()->i2doc_affine().inverse() * _dnd_source->i2doc_affine());
+        }else{
+            SPItem* parent = _dnd_into ? _dnd_target : dynamic_cast<SPItem*>(_dnd_target->parent);
+            if(parent){
+                Geom::Affine move = parent->i2doc_affine().inverse() * _dnd_source->i2doc_affine();
+                _dnd_source->doWriteTransform(_dnd_source->getRepr(), move);
+            }
+        }
         _dnd_source->moveTo(_dnd_target, _dnd_into);
         _selectLayer(_dnd_source);
         _dnd_source = NULL;
         DocumentUndo::done( _desktop->doc() , SP_VERB_NONE,
                                             _("Moved layer"));
-
     }
 }