summaryrefslogtreecommitdiffstats
path: root/src/ui
diff options
context:
space:
mode:
authorMarc Jeanmougin <marc@jeanmougin.fr>2015-12-19 00:13:37 +0000
committerMarc Jeanmougin <marcjeanmougin@free.fr>2015-12-19 00:13:37 +0000
commit1e70568de64dabbccd225f6a0124e2447b35cbfa (patch)
treebd0f24306919e34b9ced57a9094b7aa2b1850f9f /src/ui
parentbrings back CMS tab (diff)
downloadinkscape-1e70568de64dabbccd225f6a0124e2447b35cbfa.tar.gz
inkscape-1e70568de64dabbccd225f6a0124e2447b35cbfa.zip
fixes layer movement when there is a document scaling factor
(bzr r14538)
Diffstat (limited to 'src/ui')
-rw-r--r--src/ui/dialog/layers.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ui/dialog/layers.cpp b/src/ui/dialog/layers.cpp
index f4152e556..1c022ecad 100644
--- a/src/ui/dialog/layers.cpp
+++ b/src/ui/dialog/layers.cpp
@@ -715,11 +715,11 @@ void LayersPanel::_doTreeMove( )
{
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());
+ _dnd_source->doWriteTransform(_dnd_source->getRepr(), _dnd_source->i2doc_affine() * _dnd_source->document->getRoot()->i2doc_affine().inverse());
}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();
+ Geom::Affine move = _dnd_source->i2doc_affine() * parent->i2doc_affine().inverse();
_dnd_source->doWriteTransform(_dnd_source->getRepr(), move);
}
}