summaryrefslogtreecommitdiffstats
path: root/src/ui/control-manager.cpp
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2015-12-08 02:02:40 +0000
committerjabiertxof <jabier.arraiza@marker.es>2015-12-08 02:02:40 +0000
commit2f87fb8f6ee1c0d16ef54e546462ac659acab51f (patch)
tree9948abff72f547c04c1c5d19a5578cb30e6c4d95 /src/ui/control-manager.cpp
parentstatic code analysis (diff)
parentupdate to trunk (diff)
downloadinkscape-2f87fb8f6ee1c0d16ef54e546462ac659acab51f.tar.gz
inkscape-2f87fb8f6ee1c0d16ef54e546462ac659acab51f.zip
merge lp:~inkscape.dev/inkscape/lock_guides
(bzr r14512)
Diffstat (limited to 'src/ui/control-manager.cpp')
-rw-r--r--src/ui/control-manager.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/ui/control-manager.cpp b/src/ui/control-manager.cpp
index 5a3c5a496..7a5620684 100644
--- a/src/ui/control-manager.cpp
+++ b/src/ui/control-manager.cpp
@@ -298,7 +298,11 @@ void ControlManagerImpl::updateItem(SPCanvasItem *item)
double target = _sizeTable[item->ctrlType][_size - 1];
if ((item->ctrlType == CTRL_TYPE_ORIGIN) && SP_IS_CTRLPOINT(item)) {
- sp_ctrlpoint_set_radius(SP_CTRLPOINT(item), target / 2.0);
+ if (SP_CTRLPOINT(item)->is_circle ) {
+ sp_ctrlpoint_set_lenght(SP_CTRLPOINT(item), target );
+ } else {
+ sp_ctrlpoint_set_lenght(SP_CTRLPOINT(item), target + 2 );
+ }
} else {
if (_sizeChangers.count(item->ctrlType) && _manager.isSelected(item)) {
target += 2;