summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2015-08-05 21:04:36 +0000
committerJabiertxof <jtx@jtx.marker.es>2015-08-05 21:04:36 +0000
commit8f7b20b0398adda59770d7db3d83dbaae16e61ba (patch)
tree34d076b57c083906ee5bf54249828da55cdd7129
parentupdate to trunk (diff)
parentAllow scale on bend items (diff)
downloadinkscape-8f7b20b0398adda59770d7db3d83dbaae16e61ba.tar.gz
inkscape-8f7b20b0398adda59770d7db3d83dbaae16e61ba.zip
update to trunk
(bzr r14272.1.4)
-rw-r--r--src/ui/tools/freehand-base.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/ui/tools/freehand-base.cpp b/src/ui/tools/freehand-base.cpp
index 6adece54f..31fb2f376 100644
--- a/src/ui/tools/freehand-base.cpp
+++ b/src/ui/tools/freehand-base.cpp
@@ -414,7 +414,11 @@ static void spdc_check_for_and_apply_waiting_LPE(FreehandBase *dc, SPItem *item,
bend_item = dc->selection->singleItem();
if(bend_item){
bend_item->moveTo(item,false);
- bend_item->transform = Geom::Affine(1,0,0,1,0,0);
+ Geom::Coord expansion_X = bend_item->transform.expansionX();
+ Geom::Coord expansion_Y = bend_item->transform.expansionY();
+ bend_item->transform = Geom::Affine(1,0,0,1,0,0);
+ bend_item->transform.setExpansionX(expansion_X);
+ bend_item->transform.setExpansionY(expansion_Y);
spdc_apply_bend_shape(svgd, dc, bend_item);
dc->selection->add(SP_OBJECT(bend_item));
} else {
@@ -446,7 +450,11 @@ static void spdc_check_for_and_apply_waiting_LPE(FreehandBase *dc, SPItem *item,
bend_item = dc->selection->singleItem();
if(bend_item){
bend_item->moveTo(item,false);
+ Geom::Coord expansion_X = bend_item->transform.expansionX();
+ Geom::Coord expansion_Y = bend_item->transform.expansionY();
bend_item->transform = Geom::Affine(1,0,0,1,0,0);
+ bend_item->transform.setExpansionX(expansion_X);
+ bend_item->transform.setExpansionY(expansion_Y);
spdc_apply_bend_shape(svgd, dc, bend_item);
dc->selection->add(SP_OBJECT(bend_item));
shape = BEND_CLIPBOARD;