diff options
| author | Martin Owens <doctormo@gmail.com> | 2015-12-10 05:43:23 +0000 |
|---|---|---|
| committer | Martin Owens <doctormo@gmail.com> | 2015-12-10 05:43:23 +0000 |
| commit | 1b5e5271ae41e3ab4e2d352118e66ccafc608a6f (patch) | |
| tree | fdb7bf33ae747cebb9428612bbd998723eb28aa6 /src/ui | |
| parent | Remove unused header file. (diff) | |
| download | inkscape-1b5e5271ae41e3ab4e2d352118e66ccafc608a6f.tar.gz inkscape-1b5e5271ae41e3ab4e2d352118e66ccafc608a6f.zip | |
Remove CtrlPoint and replace with SPKnot
(bzr r14523)
Diffstat (limited to 'src/ui')
| -rw-r--r-- | src/ui/control-manager.cpp | 26 | ||||
| -rw-r--r-- | src/ui/control-types.h | 1 |
2 files changed, 4 insertions, 23 deletions
diff --git a/src/ui/control-manager.cpp b/src/ui/control-manager.cpp index 7a5620684..cedaea405 100644 --- a/src/ui/control-manager.cpp +++ b/src/ui/control-manager.cpp @@ -20,7 +20,6 @@ #include "display/sp-canvas-item.h" #include "display/sp-ctrlline.h" #include "display/sp-ctrlcurve.h" -#include "display/sp-ctrlpoint.h" #include "preferences.h" using Inkscape::ControlFlags; @@ -139,8 +138,6 @@ ControlManagerImpl::ControlManagerImpl(ControlManager &manager) : _typeTable[CTRL_TYPE_NODE_SMOOTH] = SP_TYPE_CTRL; _typeTable[CTRL_TYPE_NODE_SYMETRICAL] = SP_TYPE_CTRL; - _typeTable[CTRL_TYPE_ORIGIN] = SP_TYPE_CTRLPOINT; - _typeTable[CTRL_TYPE_LINE] = SP_TYPE_CTRLLINE; @@ -183,10 +180,6 @@ ControlManagerImpl::ControlManagerImpl(ControlManager &manager) : _sizeTable[CTRL_TYPE_SHAPER] = std::vector<int>(sizes, sizes + (sizeof(sizes) / sizeof(sizes[0]))); } { - int sizes[] = {2, 3, 4, 7, 8, 9, 10}; - _sizeTable[CTRL_TYPE_ORIGIN] = std::vector<int>(sizes, sizes + (sizeof(sizes) / sizeof(sizes[0]))); - } - { int sizes[] = {5, 7, 9, 10, 11, 12, 13}; _sizeTable[CTRL_TYPE_NODE_AUTO] = std::vector<int>(sizes, sizes + (sizeof(sizes) / sizeof(sizes[0]))); _sizeTable[CTRL_TYPE_NODE_CUSP] = std::vector<int>(sizes, sizes + (sizeof(sizes) / sizeof(sizes[0]))); @@ -258,10 +251,6 @@ SPCanvasItem *ControlManagerImpl::createControl(SPCanvasGroup *parent, ControlTy NULL); break; } - case CTRL_TYPE_ORIGIN: - item = sp_canvas_item_new(parent, SP_TYPE_CTRLPOINT, - NULL); - break; case CTRL_TYPE_INVISIPOINT: item = sp_canvas_item_new(parent, SP_TYPE_CTRL, "shape", SP_CTRL_SHAPE_SQUARE, @@ -297,18 +286,11 @@ void ControlManagerImpl::updateItem(SPCanvasItem *item) if (item) { double target = _sizeTable[item->ctrlType][_size - 1]; - if ((item->ctrlType == CTRL_TYPE_ORIGIN) && SP_IS_CTRLPOINT(item)) { - 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; - } - g_object_set(item, "size", target, NULL); + if (_sizeChangers.count(item->ctrlType) && _manager.isSelected(item)) { + target += 2; } + g_object_set(item, "size", target, NULL); + sp_canvas_item_request_update(item); } } diff --git a/src/ui/control-types.h b/src/ui/control-types.h index 0bbf31144..1a0230324 100644 --- a/src/ui/control-types.h +++ b/src/ui/control-types.h @@ -26,7 +26,6 @@ enum ControlType { CTRL_TYPE_ROTATE, CTRL_TYPE_SIZER, CTRL_TYPE_SHAPER, - CTRL_TYPE_ORIGIN, CTRL_TYPE_LINE, CTRL_TYPE_NODE_AUTO, CTRL_TYPE_NODE_CUSP, |