From 0459094999e0298341ecad677464043528d1036f Mon Sep 17 00:00:00 2001 From: "Jon A. Cruz" Date: Wed, 9 May 2012 00:54:48 -0700 Subject: Centralized line creation and enhanced visibility. (bzr r11350) --- src/ui/control-manager.cpp | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'src/ui/control-manager.cpp') diff --git a/src/ui/control-manager.cpp b/src/ui/control-manager.cpp index ea9cf175d..d19c4a877 100644 --- a/src/ui/control-manager.cpp +++ b/src/ui/control-manager.cpp @@ -16,6 +16,7 @@ #include #include "display/sodipodi-ctrl.h" // for SP_TYPE_CTRL +#include "display/sp-ctrlline.h" #include "display/sp-ctrlpoint.h" #include "preferences.h" @@ -28,6 +29,11 @@ std::map > sizeTable; #define FILL_COLOR_NORMAL 0xffffff7f #define FILL_COLOR_MOUSEOVER 0xff0000ff +// Default color for line: +#define LINE_COLOR_PRIMARY 0x0000ff7f +#define LINE_COLOR_SECONDARY 0xff00007f +#define LINE_COLOR_TERTIARY 0xffff007f + namespace Inkscape { class ControlManagerImpl @@ -231,6 +237,27 @@ SPCanvasItem *ControlManager::createControl(SPCanvasGroup *parent, ControlType t return item; } +SPCtrlLine *ControlManager::createControlLine(SPCanvasGroup *parent, CtrlLineType type) +{ + SPCtrlLine *line = SP_CTRLLINE(sp_canvas_item_new(parent, SP_TYPE_CTRLLINE, NULL)); + if (line) { + line->ctrlType = CTRL_TYPE_LINE; + + line->setRgba32((type == CTLINE_PRIMARY) ? LINE_COLOR_PRIMARY : + (type == CTLINE_SECONDARY) ? LINE_COLOR_SECONDARY : LINE_COLOR_TERTIARY); + } + return line; +} + +SPCtrlLine *ControlManager::createControlLine(SPCanvasGroup *parent, Geom::Point const &p1, Geom::Point const &p2, CtrlLineType type) +{ + SPCtrlLine *line = createControlLine(parent, type); + if (line) { + line->setCoords(p1, p2); + } + return line; +} + void ControlManager::track(SPCanvasItem *item) { _impl->track(item); -- cgit v1.2.3 From b6ea2239ffc053e66238eb8484bbc5c1ba8700ac Mon Sep 17 00:00:00 2001 From: "Jon A. Cruz" Date: Thu, 17 May 2012 02:10:15 -0700 Subject: Extended resizing to node handles. (bzr r11375) --- src/ui/control-manager.cpp | 89 ++++++++++++++++++++++++++++------------------ 1 file changed, 55 insertions(+), 34 deletions(-) (limited to 'src/ui/control-manager.cpp') diff --git a/src/ui/control-manager.cpp b/src/ui/control-manager.cpp index d19c4a877..33d262c31 100644 --- a/src/ui/control-manager.cpp +++ b/src/ui/control-manager.cpp @@ -16,6 +16,7 @@ #include #include "display/sodipodi-ctrl.h" // for SP_TYPE_CTRL +#include "display/sp-canvas-item.h" #include "display/sp-ctrlline.h" #include "display/sp-ctrlpoint.h" #include "preferences.h" @@ -43,6 +44,8 @@ public: ~ControlManagerImpl() {} + SPCanvasItem *createControl(SPCanvasGroup *parent, ControlType type); + void setControlSize(int size, bool force = false); void track(SPCanvasItem *anchor); @@ -98,7 +101,7 @@ ControlManagerImpl::ControlManagerImpl() : _sizeTable[CTRL_TYPE_ANCHOR] = std::vector(sizes, sizes + (sizeof(sizes) / sizeof(sizes[0]))); } { - int sizes[] = {2, 3, 4, 7, 8, 9, 10}; + int sizes[] = {2, 4, 7, 8, 9, 10, 12}; _sizeTable[CTRL_TYPE_ADJ_HANDLE] = std::vector(sizes, sizes + (sizeof(sizes) / sizeof(sizes[0]))); } { @@ -112,6 +115,10 @@ ControlManagerImpl::ControlManagerImpl() : int sizes[] = {2, 3, 4, 7, 8, 9, 10}; _sizeTable[CTRL_TYPE_ORIGIN] = std::vector(sizes, sizes + (sizeof(sizes) / sizeof(sizes[0]))); } + { + int sizes[] = {1, 1, 1, 1, 1, 1, 1}; + _sizeTable[CTRL_TYPE_INVISIPOINT] = std::vector(sizes, sizes + (sizeof(sizes) / sizeof(sizes[0]))); + } } @@ -133,6 +140,52 @@ void ControlManagerImpl::setControlSize(int size, bool force) } } +SPCanvasItem *ControlManagerImpl::createControl(SPCanvasGroup *parent, ControlType type) +{ + SPCanvasItem *item = 0; + double targetSize = _sizeTable[type][_size - 1]; + switch (type) + { + case CTRL_TYPE_ADJ_HANDLE: + item = sp_canvas_item_new(parent, SP_TYPE_CTRL, + "shape", SP_CTRL_SHAPE_CIRCLE, + "size", targetSize, + "filled", 0, + "fill_color", 0xff00007f, + "stroked", 1, + "stroke_color", 0x0000ff7f, + NULL); + break; + case CTRL_TYPE_ANCHOR: + item = sp_canvas_item_new(parent, SP_TYPE_CTRL, + "size", targetSize, + "filled", 1, + "fill_color", FILL_COLOR_NORMAL, + "stroked", 1, + "stroke_color", 0x000000ff, + NULL); + break; + case CTRL_TYPE_ORIGIN: + item = sp_canvas_item_new(parent, SP_TYPE_CTRLPOINT, + "size", targetSize, + NULL); + break; + case CTRL_TYPE_INVISIPOINT: + item = sp_canvas_item_new(parent, SP_TYPE_CTRL, + "shape", SP_CTRL_SHAPE_SQUARE, + "size", targetSize, + NULL); + break; + case CTRL_TYPE_UNKNOWN: + default: + item = sp_canvas_item_new(parent, SP_TYPE_CTRL, NULL); + } + if (item) { + item->ctrlType = type; + } + return item; +} + void ControlManagerImpl::track(SPCanvasItem *item) { g_object_weak_ref( G_OBJECT(item), ControlManagerImpl::thingFinalized, this ); @@ -202,39 +255,7 @@ ControlManager &ControlManager::getManager() SPCanvasItem *ControlManager::createControl(SPCanvasGroup *parent, ControlType type) { - SPCanvasItem *item = 0; - switch (type) - { - case CTRL_TYPE_ADJ_HANDLE: - item = sp_canvas_item_new(parent, SP_TYPE_CTRL, - "shape", SP_CTRL_SHAPE_CIRCLE, - "size", 4.0, - "filled", 0, - "fill_color", 0xff00007f, - "stroked", 1, - "stroke_color", 0x0000ff7f, - NULL); - break; - case CTRL_TYPE_ANCHOR: - item = sp_canvas_item_new(parent, SP_TYPE_CTRL, - "size", 6.0, - "filled", 1, - "fill_color", FILL_COLOR_NORMAL, - "stroked", 1, - "stroke_color", 0x000000ff, - NULL); - break; - case CTRL_TYPE_ORIGIN: - item = sp_canvas_item_new(parent, SP_TYPE_CTRLPOINT, NULL); - break; - case CTRL_TYPE_UNKNOWN: - default: - item = sp_canvas_item_new(parent, SP_TYPE_CTRL, NULL); - } - if (item) { - item->ctrlType = type; - } - return item; + return _impl->createControl(parent, type); } SPCtrlLine *ControlManager::createControlLine(SPCanvasGroup *parent, CtrlLineType type) -- cgit v1.2.3 From a2a8d9df27ecf9d44ddcfbd714af004ea2ea3e19 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Fri, 18 May 2012 09:12:49 +0100 Subject: Don't try to set non-existent size property in ctrlpoint (bzr r11380) --- src/ui/control-manager.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'src/ui/control-manager.cpp') diff --git a/src/ui/control-manager.cpp b/src/ui/control-manager.cpp index 33d262c31..0e39737b8 100644 --- a/src/ui/control-manager.cpp +++ b/src/ui/control-manager.cpp @@ -167,7 +167,6 @@ SPCanvasItem *ControlManagerImpl::createControl(SPCanvasGroup *parent, ControlTy break; case CTRL_TYPE_ORIGIN: item = sp_canvas_item_new(parent, SP_TYPE_CTRLPOINT, - "size", targetSize, NULL); break; case CTRL_TYPE_INVISIPOINT: -- cgit v1.2.3 From 9d9347ae2714146bc1a943e8b15f26f161e6e10c Mon Sep 17 00:00:00 2001 From: "Jon A. Cruz" Date: Sun, 20 May 2012 21:44:54 -0700 Subject: Extended control resizing to node editing. Fixes half of bug #172059. Additional prep for centralizing color setting. (bzr r11390) --- src/ui/control-manager.cpp | 192 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 189 insertions(+), 3 deletions(-) (limited to 'src/ui/control-manager.cpp') diff --git a/src/ui/control-manager.cpp b/src/ui/control-manager.cpp index 0e39737b8..124e591a8 100644 --- a/src/ui/control-manager.cpp +++ b/src/ui/control-manager.cpp @@ -12,6 +12,8 @@ #include "control-manager.h" #include +#include + #include #include @@ -21,10 +23,47 @@ #include "display/sp-ctrlpoint.h" #include "preferences.h" +using Inkscape::ControlFlags; + namespace { std::map > sizeTable; +// Note: The following operator overloads are local to this file at the moment to discourage flag manipulation elsewhere. + +ControlFlags operator |(ControlFlags lhs, ControlFlags rhs) +{ + return static_cast(static_cast(lhs) | static_cast(rhs)); +} + +ControlFlags& operator |=(ControlFlags &lhs, ControlFlags rhs) +{ + lhs = lhs | rhs; + return lhs; +} + +ControlFlags operator &(ControlFlags lhs, ControlFlags rhs) +{ + return static_cast(static_cast(lhs) & static_cast(rhs)); +} + +ControlFlags& operator &=(ControlFlags &lhs, ControlFlags rhs) +{ + lhs = lhs & rhs; + return lhs; +} + +ControlFlags operator ^(ControlFlags lhs, ControlFlags rhs) +{ + return static_cast(static_cast(lhs) ^ static_cast(rhs)); +} + +ControlFlags& operator ^=(ControlFlags &lhs, ControlFlags rhs) +{ + lhs = lhs ^ rhs; + return lhs; +} + } // namespace #define FILL_COLOR_NORMAL 0xffffff7f @@ -40,7 +79,7 @@ namespace Inkscape { class ControlManagerImpl { public: - ControlManagerImpl(); + ControlManagerImpl(ControlManager &manager); ~ControlManagerImpl() {} @@ -54,6 +93,10 @@ public: void updateItem(SPCanvasItem *item); + bool setControlType(SPCanvasItem *item, ControlType type); + + void setSelected(SPCanvasItem *item, bool selected); + private: static void thingFinalized(gpointer data, GObject *wasObj); @@ -73,14 +116,20 @@ private: ControlManagerImpl &_mgr; }; + + ControlManager &_manager; sigc::signal _sizeChangedSignal; PrefListener _prefHook; int _size; std::vector _itemList; std::map > _sizeTable; + std::map _typeTable; + std::map _ctrlToShape; + std::set _sizeChangers; }; -ControlManagerImpl::ControlManagerImpl() : +ControlManagerImpl::ControlManagerImpl(ControlManager &manager) : + _manager(manager), _sizeChangedSignal(), _prefHook(*this), _size(3), @@ -92,6 +141,39 @@ ControlManagerImpl::ControlManagerImpl() : _size = prefs->getIntLimited("/options/grabsize/value", 3, 1, 7); + _typeTable[CTRL_TYPE_UNKNOWN] = SP_TYPE_CTRL; + _typeTable[CTRL_TYPE_ADJ_HANDLE] = SP_TYPE_CTRL; + _typeTable[CTRL_TYPE_ANCHOR] = SP_TYPE_CTRL; + _typeTable[CTRL_TYPE_INVISIPOINT] = SP_TYPE_CTRL; + _typeTable[CTRL_TYPE_NODE_AUTO] = SP_TYPE_CTRL; + _typeTable[CTRL_TYPE_NODE_CUSP] = SP_TYPE_CTRL; + _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; + + + // ------- + _ctrlToShape[CTRL_TYPE_UNKNOWN] = SP_CTRL_SHAPE_DIAMOND; + _ctrlToShape[CTRL_TYPE_NODE_CUSP] = SP_CTRL_SHAPE_DIAMOND; + _ctrlToShape[CTRL_TYPE_NODE_SMOOTH] = SP_CTRL_SHAPE_SQUARE; + _ctrlToShape[CTRL_TYPE_NODE_AUTO] = SP_CTRL_SHAPE_CIRCLE; + _ctrlToShape[CTRL_TYPE_NODE_SYMETRICAL] = SP_CTRL_SHAPE_SQUARE; + + _ctrlToShape[CTRL_TYPE_ADJ_HANDLE] = SP_CTRL_SHAPE_CIRCLE; + _ctrlToShape[CTRL_TYPE_INVISIPOINT] = SP_CTRL_SHAPE_SQUARE; + + // ------- + + _sizeChangers.insert(CTRL_TYPE_NODE_AUTO); + _sizeChangers.insert(CTRL_TYPE_NODE_CUSP); + _sizeChangers.insert(CTRL_TYPE_NODE_SMOOTH); + _sizeChangers.insert(CTRL_TYPE_NODE_SYMETRICAL); + + // ------- + { int sizes[] = {8, 8, 8, 8, 8, 8, 8}; _sizeTable[CTRL_TYPE_UNKNOWN] = std::vector(sizes, sizes + (sizeof(sizes) / sizeof(sizes[0]))); @@ -115,6 +197,16 @@ ControlManagerImpl::ControlManagerImpl() : int sizes[] = {2, 3, 4, 7, 8, 9, 10}; _sizeTable[CTRL_TYPE_ORIGIN] = std::vector(sizes, sizes + (sizeof(sizes) / sizeof(sizes[0]))); } + { + int sizes[] = {5, 7, 9, 10, 11, 12, 13}; + _sizeTable[CTRL_TYPE_NODE_AUTO] = std::vector(sizes, sizes + (sizeof(sizes) / sizeof(sizes[0]))); + _sizeTable[CTRL_TYPE_NODE_CUSP] = std::vector(sizes, sizes + (sizeof(sizes) / sizeof(sizes[0]))); + } + { + int sizes[] = {3, 5, 7, 8, 9, 10, 11}; + _sizeTable[CTRL_TYPE_NODE_SMOOTH] = std::vector(sizes, sizes + (sizeof(sizes) / sizeof(sizes[0]))); + _sizeTable[CTRL_TYPE_NODE_SYMETRICAL] = std::vector(sizes, sizes + (sizeof(sizes) / sizeof(sizes[0]))); + } { int sizes[] = {1, 1, 1, 1, 1, 1, 1}; _sizeTable[CTRL_TYPE_INVISIPOINT] = std::vector(sizes, sizes + (sizeof(sizes) / sizeof(sizes[0]))); @@ -165,6 +257,18 @@ SPCanvasItem *ControlManagerImpl::createControl(SPCanvasGroup *parent, ControlTy "stroke_color", 0x000000ff, NULL); break; + case CTRL_TYPE_NODE_AUTO: + case CTRL_TYPE_NODE_CUSP: + case CTRL_TYPE_NODE_SMOOTH: + case CTRL_TYPE_NODE_SYMETRICAL: + { + SPCtrlShapeType shape = _ctrlToShape[_ctrlToShape.count(type) ? type : CTRL_TYPE_UNKNOWN]; + item = sp_canvas_item_new(parent, SP_TYPE_CTRL, + "shape", shape, + "size", targetSize, + NULL); + break; + } case CTRL_TYPE_ORIGIN: item = sp_canvas_item_new(parent, SP_TYPE_CTRLPOINT, NULL); @@ -203,15 +307,56 @@ void ControlManagerImpl::updateItem(SPCanvasItem *item) { if (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); } else { + if (_sizeChangers.count(item->ctrlType) && _manager.isSelected(item)) { + target += 2; + } sp_canvas_item_set(item, "size", target, NULL); } sp_canvas_item_request_update(item); } } +bool ControlManagerImpl::setControlType(SPCanvasItem *item, ControlType type) +{ + bool accepted = false; + if (item && (item->ctrlType == type)) { + // nothing to do + accepted = true; + } else if (item) { + if (_ctrlToShape.count(type) && (_typeTable[type] == _typeTable[item->ctrlType])) { // compatible? + double targetSize = _sizeTable[type][_size - 1]; + if (_manager.isSelected(item) && _sizeChangers.count(item->ctrlType)) { + targetSize += 2.0; + } + SPCtrlShapeType targetShape = _ctrlToShape[type]; + g_object_set(item, "shape", targetShape, "size", targetSize, NULL); + item->ctrlType = type; + accepted = true; + } + } + + return accepted; +} + + +void ControlManagerImpl::setSelected(SPCanvasItem *item, bool selected) +{ + if (_manager.isSelected(item) != selected) { + item->ctrlFlags ^= CTRL_FLAG_SELECTED; // toggle, since we know it is different + + // TODO refresh colors + double targetSize = _sizeTable[item->ctrlType][_size - 1]; + if (selected && _sizeChangers.count(item->ctrlType)) { + targetSize += 2.0; + } + g_object_set(item, "size", targetSize, NULL); + } +} + void ControlManagerImpl::thingFinalized(gpointer data, GObject *wasObj) { if (data) { @@ -236,7 +381,7 @@ void ControlManagerImpl::thingFinalized(GObject *wasObj) // ---------------------------------------------------- ControlManager::ControlManager() : - _impl(new ControlManagerImpl()) + _impl(new ControlManagerImpl(*this)) { } @@ -293,6 +438,47 @@ void ControlManager::updateItem(SPCanvasItem *item) return _impl->updateItem(item); } +bool ControlManager::setControlType(SPCanvasItem *item, ControlType type) +{ + return _impl->setControlType(item, type); +} + +bool ControlManager::isActive(SPCanvasItem *item) const +{ + return (item->ctrlFlags & CTRL_FLAG_ACTIVE) != 0; +} + +void ControlManager::setActive(SPCanvasItem *item, bool active) +{ + if (isActive(item) != active) { + item->ctrlFlags ^= CTRL_FLAG_ACTIVE; // toggle, since we know it is different + // TODO refresh size/colors + } +} + +bool ControlManager::isPrelight(SPCanvasItem *item) const +{ + return (item->ctrlFlags & CTRL_FLAG_PRELIGHT) != 0; +} + +void ControlManager::setPrelight(SPCanvasItem *item, bool prelight) +{ + if (isPrelight(item) != prelight) { + item->ctrlFlags ^= CTRL_FLAG_PRELIGHT; // toggle, since we know it is different + // TODO refresh size/colors + } +} + +bool ControlManager::isSelected(SPCanvasItem *item) const +{ + return (item->ctrlFlags & CTRL_FLAG_SELECTED) != 0; +} + +void ControlManager::setSelected(SPCanvasItem *item, bool selected) +{ + _impl->setSelected(item, selected); +} + } // namespace Inkscape /* -- cgit v1.2.3 From cf7f6d596f7aec4b2775428db2196613de4feb7d Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Mon, 21 May 2012 15:59:02 +0200 Subject: Added sp-ctrlcurve, usefull for meshes. (bzr r11395) --- src/ui/control-manager.cpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'src/ui/control-manager.cpp') diff --git a/src/ui/control-manager.cpp b/src/ui/control-manager.cpp index 124e591a8..6bd2d6fd8 100644 --- a/src/ui/control-manager.cpp +++ b/src/ui/control-manager.cpp @@ -20,6 +20,7 @@ #include "display/sodipodi-ctrl.h" // for SP_TYPE_CTRL #include "display/sp-canvas-item.h" #include "display/sp-ctrlline.h" +#include "display/sp-ctrlcurve.h" #include "display/sp-ctrlpoint.h" #include "preferences.h" @@ -423,6 +424,19 @@ SPCtrlLine *ControlManager::createControlLine(SPCanvasGroup *parent, Geom::Point return line; } +SPCtrlCurve *ControlManager::createControlCurve(SPCanvasGroup *parent, Geom::Point const &p0, Geom::Point const &p1, Geom::Point const &p2, Geom::Point const &p3, CtrlLineType type) +{ + SPCtrlCurve *line = SP_CTRLCURVE(sp_canvas_item_new(parent, SP_TYPE_CTRLCURVE, NULL)); + if (line) { + line->ctrlType = CTRL_TYPE_LINE; + + line->setRgba32((type == CTLINE_PRIMARY) ? LINE_COLOR_PRIMARY : + (type == CTLINE_SECONDARY) ? LINE_COLOR_SECONDARY : LINE_COLOR_TERTIARY); + line->setCoords(p0, p1, p2, p3); + } + return line; +} + void ControlManager::track(SPCanvasItem *item) { _impl->track(item); -- cgit v1.2.3 From c21611294dea99e78017f770feb78684573cce89 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Tue, 5 Jun 2012 13:34:43 +0100 Subject: Header cleaning for GTK+3 migration (bzr r11460) --- src/ui/control-manager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/ui/control-manager.cpp') diff --git a/src/ui/control-manager.cpp b/src/ui/control-manager.cpp index 6bd2d6fd8..b14f27b8b 100644 --- a/src/ui/control-manager.cpp +++ b/src/ui/control-manager.cpp @@ -315,7 +315,7 @@ void ControlManagerImpl::updateItem(SPCanvasItem *item) if (_sizeChangers.count(item->ctrlType) && _manager.isSelected(item)) { target += 2; } - sp_canvas_item_set(item, "size", target, NULL); + g_object_set(item, "size", target, NULL); } sp_canvas_item_request_update(item); } -- cgit v1.2.3 From 6753a094002684a8f14232934c9cdeba13e00e8e Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Mon, 18 Mar 2013 00:36:01 +0000 Subject: Fix -Wunused-function warnings (bzr r12221) --- src/ui/control-manager.cpp | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'src/ui/control-manager.cpp') diff --git a/src/ui/control-manager.cpp b/src/ui/control-manager.cpp index b14f27b8b..9357a17ff 100644 --- a/src/ui/control-manager.cpp +++ b/src/ui/control-manager.cpp @@ -37,23 +37,11 @@ ControlFlags operator |(ControlFlags lhs, ControlFlags rhs) return static_cast(static_cast(lhs) | static_cast(rhs)); } -ControlFlags& operator |=(ControlFlags &lhs, ControlFlags rhs) -{ - lhs = lhs | rhs; - return lhs; -} - ControlFlags operator &(ControlFlags lhs, ControlFlags rhs) { return static_cast(static_cast(lhs) & static_cast(rhs)); } -ControlFlags& operator &=(ControlFlags &lhs, ControlFlags rhs) -{ - lhs = lhs & rhs; - return lhs; -} - ControlFlags operator ^(ControlFlags lhs, ControlFlags rhs) { return static_cast(static_cast(lhs) ^ static_cast(rhs)); -- cgit v1.2.3 From 5f108f6e174fd6f4cd968a4f6486d1d620667e29 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Mon, 18 Mar 2013 13:07:58 +0000 Subject: Drop remaining unused functions (bzr r12224) --- src/ui/control-manager.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/ui/control-manager.cpp') diff --git a/src/ui/control-manager.cpp b/src/ui/control-manager.cpp index 9357a17ff..62e6ce3a3 100644 --- a/src/ui/control-manager.cpp +++ b/src/ui/control-manager.cpp @@ -31,11 +31,12 @@ namespace { std::map > sizeTable; // Note: The following operator overloads are local to this file at the moment to discourage flag manipulation elsewhere. - +/* ControlFlags operator |(ControlFlags lhs, ControlFlags rhs) { return static_cast(static_cast(lhs) | static_cast(rhs)); } +*/ ControlFlags operator &(ControlFlags lhs, ControlFlags rhs) { -- cgit v1.2.3 From 024fe729644d74a60088fa29fcc69ce4327fbe58 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Fri, 29 Mar 2013 11:00:19 +0000 Subject: Header cleanup (bzr r12258) --- src/ui/control-manager.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'src/ui/control-manager.cpp') diff --git a/src/ui/control-manager.cpp b/src/ui/control-manager.cpp index 62e6ce3a3..5a3c5a496 100644 --- a/src/ui/control-manager.cpp +++ b/src/ui/control-manager.cpp @@ -14,7 +14,6 @@ #include #include -#include #include #include "display/sodipodi-ctrl.h" // for SP_TYPE_CTRL -- cgit v1.2.3