diff options
| author | Marc Jeanmougin <marc@jeanmougin.fr> | 2015-12-08 08:29:33 +0000 |
|---|---|---|
| committer | Marc Jeanmougin <marcjeanmougin@free.fr> | 2015-12-08 08:29:33 +0000 |
| commit | 5e5f10dfcca24194acdcb4b301f9e989ddc6e209 (patch) | |
| tree | 9287d4cdc6ff3281620a65091fb9a3ccd13c9b79 /src/ui/control-manager.cpp | |
| parent | fix crash (oops) (diff) | |
| parent | merge lp:~inkscape.dev/inkscape/lock_guides (diff) | |
| download | inkscape-5e5f10dfcca24194acdcb4b301f9e989ddc6e209.tar.gz inkscape-5e5f10dfcca24194acdcb4b301f9e989ddc6e209.zip | |
update to trunk + resolve conflicts
(bzr r14504.1.9)
Diffstat (limited to 'src/ui/control-manager.cpp')
| -rw-r--r-- | src/ui/control-manager.cpp | 6 |
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; |