summaryrefslogtreecommitdiffstats
path: root/src/ui
diff options
context:
space:
mode:
authorJabier Arraiza <jabier.arraiza@marker.es>2017-10-24 23:13:38 +0000
committerJabier Arraiza <jabier.arraiza@marker.es>2017-10-24 23:13:38 +0000
commit07bc5811acd5244febcf450ea3012b3e8bd37158 (patch)
tree22f1e765aa989c65dea46d3292e6ccba09f17c83 /src/ui
parentAdd progressbar to all actions (diff)
parentGive drawing a reasonable(?) default size if dimensions are in % and there is... (diff)
downloadinkscape-07bc5811acd5244febcf450ea3012b3e8bd37158.tar.gz
inkscape-07bc5811acd5244febcf450ea3012b3e8bd37158.zip
Merge branch 'master' into SymbolsSearch
Diffstat (limited to 'src/ui')
-rw-r--r--src/ui/control-manager.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/ui/control-manager.cpp b/src/ui/control-manager.cpp
index d0285e467..d0106bfcd 100644
--- a/src/ui/control-manager.cpp
+++ b/src/ui/control-manager.cpp
@@ -330,10 +330,12 @@ void ControlManagerImpl::setSelected(SPCanvasItem *item, bool selected)
if (selected && _resizeOnSelect.count(item->ctrlType)) {
item->ctrlResize = 2;
+ } else {
+ item->ctrlResize = 0;
}
// TODO refresh colors
- double targetSize = _sizeTable[item->ctrlType][_size - 1] + _resize;
+ double targetSize = _sizeTable[item->ctrlType][_size - 1] + item->ctrlResize;
g_object_set(item, "size", targetSize, NULL);
}
}