From f55448431e934bf29bb9a983711d204614db7cc7 Mon Sep 17 00:00:00 2001 From: Martin Owens Date: Fri, 30 Jun 2017 05:58:14 +0200 Subject: Hackfest: Refactor cursors so the hot spot is inside the xpm --- src/ui/tools/connector-tool.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/ui/tools/connector-tool.cpp') diff --git a/src/ui/tools/connector-tool.cpp b/src/ui/tools/connector-tool.cpp index 7e6fb4b72..29be4831a 100644 --- a/src/ui/tools/connector-tool.cpp +++ b/src/ui/tools/connector-tool.cpp @@ -145,7 +145,7 @@ const std::string& ConnectorTool::getPrefsPath() { const std::string ConnectorTool::prefsPath = "/tools/connector"; ConnectorTool::ConnectorTool() - : ToolBase(cursor_connector_xpm, 1, 1) + : ToolBase(cursor_connector_xpm) , selection(NULL) , npoints(0) , state(SP_CONNECTOR_CONTEXT_IDLE) -- cgit v1.2.3 From 9f76180aa2939384a17b4ea85fdfd0c1acbe5736 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Date: Fri, 30 Jun 2017 17:39:02 +0200 Subject: Starting selectable knots --- src/ui/tools/connector-tool.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/ui/tools/connector-tool.cpp') diff --git a/src/ui/tools/connector-tool.cpp b/src/ui/tools/connector-tool.cpp index 29be4831a..ad0b9e8ba 100644 --- a/src/ui/tools/connector-tool.cpp +++ b/src/ui/tools/connector-tool.cpp @@ -348,7 +348,7 @@ cc_select_handle(SPKnot* knot) knot->setShape(SP_KNOT_SHAPE_SQUARE); knot->setSize(10); knot->setAnchor(SP_ANCHOR_CENTER); - knot->setFill(0x0000ffff, 0x0000ffff, 0x0000ffff); + knot->setFill(0x0000ffff, 0x0000ffff, 0x0000ffff, 0x0000ffff); knot->updateCtrl(); } @@ -358,7 +358,7 @@ cc_deselect_handle(SPKnot* knot) knot->setShape(SP_KNOT_SHAPE_SQUARE); knot->setSize(8); knot->setAnchor(SP_ANCHOR_CENTER); - knot->setFill(0xffffff00, 0xff0000ff, 0xff0000ff); + knot->setFill(0xffffff00, 0xff0000ff, 0xff0000ff, 0xff0000ff); knot->updateCtrl(); } @@ -1058,7 +1058,7 @@ void ConnectorTool::_activeShapeAddKnot(SPItem* item) { knot->setShape(SP_KNOT_SHAPE_SQUARE); knot->setSize(8); knot->setAnchor(SP_ANCHOR_CENTER); - knot->setFill(0xffffff00, 0xff0000ff, 0xff0000ff); + knot->setFill(0xffffff00, 0xff0000ff, 0xff0000ff, 0xff0000ff); knot->updateCtrl(); // We don't want to use the standard knot handler. @@ -1176,8 +1176,8 @@ void ConnectorTool::cc_set_active_conn(SPItem *item) { knot->setShape(SP_KNOT_SHAPE_SQUARE); knot->setSize(7); knot->setAnchor(SP_ANCHOR_CENTER); - knot->setFill(0xffffff00, 0xff0000ff, 0xff0000ff); - knot->setStroke(0x000000ff, 0x000000ff, 0x000000ff); + knot->setFill(0xffffff00, 0xff0000ff, 0xff0000ff, 0xff0000ff); + knot->setStroke(0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff); knot->updateCtrl(); // We don't want to use the standard knot handler, -- cgit v1.2.3 From fd733201b82f39655488a286c89142f321ef9dc9 Mon Sep 17 00:00:00 2001 From: Sylvain Chiron Date: Sat, 1 Jul 2017 13:36:41 +0200 Subject: Updated libs from the Adaptagrams project: libavoid, libcola and libvspc; changed the code to match the new API Signed-off-by: Sylvain Chiron --- src/ui/tools/connector-tool.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/ui/tools/connector-tool.cpp') diff --git a/src/ui/tools/connector-tool.cpp b/src/ui/tools/connector-tool.cpp index 7e6fb4b72..9332335fe 100644 --- a/src/ui/tools/connector-tool.cpp +++ b/src/ui/tools/connector-tool.cpp @@ -941,8 +941,7 @@ void ConnectorTool::_finish() { this->npoints = 0; if (this->newConnRef) { - this->newConnRef->removeFromGraph(); - delete this->newConnRef; + this->newConnRef->router()->deleteConnector(this->newConnRef); this->newConnRef = NULL; } } -- cgit v1.2.3