diff options
| author | Marc Jeanmougin <marc@jeanmougin.fr> | 2017-10-28 10:33:14 +0000 |
|---|---|---|
| committer | Marc Jeanmougin <marc@jeanmougin.fr> | 2017-10-28 10:33:14 +0000 |
| commit | fa9ae5fb7c249a4c96a06bfef905c73cbb17bc3d (patch) | |
| tree | 8c06d1d61a79a74381cb75a925ef50dd598da8c2 /src/ui | |
| parent | Trying libFuzzer (diff) | |
| parent | Fix XML text parsing bug. (diff) | |
| download | inkscape-fa9ae5fb7c249a4c96a06bfef905c73cbb17bc3d.tar.gz inkscape-fa9ae5fb7c249a4c96a06bfef905c73cbb17bc3d.zip | |
Merge branch 'master' of https://gitlab.com/inkscape/inkscape
Diffstat (limited to 'src/ui')
| -rw-r--r-- | src/ui/control-manager.cpp | 4 | ||||
| -rw-r--r-- | src/ui/dialog/prototype.cpp | 2 |
2 files changed, 5 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); } } diff --git a/src/ui/dialog/prototype.cpp b/src/ui/dialog/prototype.cpp index b3bf60aab..b7c9f7abf 100644 --- a/src/ui/dialog/prototype.cpp +++ b/src/ui/dialog/prototype.cpp @@ -22,6 +22,8 @@ namespace Inkscape { namespace UI { namespace Dialog { +// Note that in order for a dialog to be restored, it must be listed in SPDesktop::show_dialogs(). + Prototype::Prototype() : // UI::Widget::Panel("Prototype Label", "/dialogs/prototype", SP_VERB_DIALOG_PROTOTYPE, // "Prototype Apply Label", true), |