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/tool/control-point.cpp | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) (limited to 'src/ui/tool/control-point.cpp') diff --git a/src/ui/tool/control-point.cpp b/src/ui/tool/control-point.cpp index 9c559be03..c3e7ccbe6 100644 --- a/src/ui/tool/control-point.cpp +++ b/src/ui/tool/control-point.cpp @@ -67,25 +67,6 @@ ControlPoint::ColorSet ControlPoint::invisible_cset = { {0x00000000, 0x00000000} }; -ControlPoint::ControlPoint(SPDesktop *d, Geom::Point const &initial_pos, SPAnchorType anchor, - SPCtrlShapeType shape, unsigned int size, - ColorSet const &cset, SPCanvasGroup *group) : - _desktop(d), - _canvas_item(NULL), - _cset(cset), - _state(STATE_NORMAL), - _position(initial_pos), - _lurking(false) -{ - _canvas_item = sp_canvas_item_new( - group ? group : sp_desktop_controls (_desktop), SP_TYPE_CTRL, - "anchor", (SPAnchorType) anchor, "size", (gdouble) size, "shape", shape, - "filled", TRUE, "fill_color", _cset.normal.fill, - "stroked", TRUE, "stroke_color", _cset.normal.stroke, - "mode", SP_CTRL_MODE_XOR, NULL); - _commonInit(); -} - ControlPoint::ControlPoint(SPDesktop *d, Geom::Point const &initial_pos, SPAnchorType anchor, Glib::RefPtr pixbuf, ColorSet const &cset, SPCanvasGroup *group) : @@ -216,9 +197,9 @@ void ControlPoint::_setSize(unsigned int size) g_object_set(_canvas_item, "size", (gdouble) size, NULL); } -void ControlPoint::_setShape(SPCtrlShapeType shape) +bool ControlPoint::_setControlType(Inkscape::ControlType type) { - g_object_set(_canvas_item, "shape", shape, NULL); + return ControlManager::getManager().setControlType(_canvas_item, type); } void ControlPoint::_setAnchor(SPAnchorType anchor) -- cgit v1.2.3