summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjghali <jghali@11d20701-8431-0410-a711-e3c959e3b870>2012-04-14 13:40:59 +0000
committerjghali <jghali@11d20701-8431-0410-a711-e3c959e3b870>2012-04-14 13:40:59 +0000
commit7c9f91878c1e4ff74a15b1584b5f05e886d73310 (patch)
tree232fc3773e4e878e23da99571b874e0ddcf45e50
parentdf8abc3b40b8bfc728f39ec4d9cfb1af394c1c78 (diff)
downloadscribus-7c9f91878c1e4ff74a15b1584b5f05e886d73310.tar.gz
scribus-7c9f91878c1e4ff74a15b1584b5f05e886d73310.tar.xz
scribus-7c9f91878c1e4ff74a15b1584b5f05e886d73310.zip
fix regression when creating lines with constrained angle introduced by #8562 fix (r17393)
git-svn-id: svn://scribus.net/branches/Version14x/Scribus@17442 11d20701-8431-0410-a711-e3c959e3b870
-rw-r--r--scribus/canvasmode_create.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/scribus/canvasmode_create.cpp b/scribus/canvasmode_create.cpp
index 8caf348..7d5ab82 100644
--- a/scribus/canvasmode_create.cpp
+++ b/scribus/canvasmode_create.cpp
@@ -589,9 +589,12 @@ PageItem* CreateMode::doCreateNewObject(void)
wSize = canvasCurrCoord.x() - createObjectPos.x();
hSize = canvasCurrCoord.y() - createObjectPos.y();
- //Lock Height to Width for Control Modifier for final item creation
- if (modifiers == Qt::ControlModifier)
- hSize=wSize;
+ if (createObjectMode != modeDrawLine)
+ {
+ //Lock Height to Width for Control Modifier for final item creation
+ if (modifiers == Qt::ControlModifier)
+ hSize = wSize;
+ }
PageItem *newObject = NULL, *currItem = NULL;
// FIXME for modeDrawLine