diff options
| author | Jabiertxof <jtx@jtx> | 2016-12-19 21:12:42 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx> | 2016-12-19 21:12:42 +0000 |
| commit | 2f6848dc2b7ed9c60dcd440d7bf4ed39423636ca (patch) | |
| tree | 155209be74f4ccf92138ec0656176053b6797438 /src/knot.cpp | |
| parent | Update to trunk (diff) | |
| parent | Remove some ocurrences of desktop in knot functions (diff) | |
| download | inkscape-2f6848dc2b7ed9c60dcd440d7bf4ed39423636ca.tar.gz inkscape-2f6848dc2b7ed9c60dcd440d7bf4ed39423636ca.zip | |
Update to trunk
(bzr r15295.1.29)
Diffstat (limited to 'src/knot.cpp')
| -rw-r--r-- | src/knot.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/knot.cpp b/src/knot.cpp index 8ac84b97b..84b72d780 100644 --- a/src/knot.cpp +++ b/src/knot.cpp @@ -25,8 +25,6 @@ #include "document-undo.h" #include "message-stack.h" #include "message-context.h" -#include "ui/tools-switch.h" -#include "ui/tools/tool-base.h" #include "ui/tools/node-tool.h" #include <gtk/gtk.h> @@ -254,10 +252,7 @@ static int sp_knot_handler(SPCanvasItem */*item*/, GdkEvent *event, SPKnot *knot consumed = TRUE; } } - if (tools_isactive(knot->desktop, TOOLS_NODES)) { - Inkscape::UI::Tools::NodeTool *nt = static_cast<Inkscape::UI::Tools::NodeTool*>(knot->desktop->event_context); - nt->update_helperpath(); - } + Inkscape::UI::Tools::sp_update_helperpath(); break; case GDK_MOTION_NOTIFY: if (grabbed && knot->desktop && knot->desktop->event_context && !knot->desktop->event_context->space_panning) { @@ -290,10 +285,7 @@ static int sp_knot_handler(SPCanvasItem */*item*/, GdkEvent *event, SPKnot *knot sp_knot_handler_request_position(event, knot); moved = TRUE; } - if (tools_isactive(knot->desktop, TOOLS_NODES)) { - Inkscape::UI::Tools::NodeTool *nt = static_cast<Inkscape::UI::Tools::NodeTool*>(knot->desktop->event_context); - nt->update_helperpath(); - } + Inkscape::UI::Tools::sp_update_helperpath(); break; case GDK_ENTER_NOTIFY: knot->setFlag(SP_KNOT_MOUSEOVER, TRUE); |