summaryrefslogtreecommitdiffstats
path: root/src/box3d-context.cpp
diff options
context:
space:
mode:
authorDiederik van Lierop <mailat-signdiedenrezidotnl>2010-08-11 06:43:24 +0000
committerDiederik van Lierop <mailat-signdiedenrezidotnl>2010-08-11 06:43:24 +0000
commit19117c36082531a00df461260f917d1207edde1f (patch)
tree4670bf8aef55b561c790e6498e8ad88592a83d75 /src/box3d-context.cpp
parentImplement constrained snapping to nodes (diff)
downloadinkscape-19117c36082531a00df461260f917d1207edde1f.tar.gz
inkscape-19117c36082531a00df461260f917d1207edde1f.zip
Clear pointers in the snapmanager if they're no longer needed.
(bzr r9697)
Diffstat (limited to 'src/box3d-context.cpp')
-rw-r--r--src/box3d-context.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/box3d-context.cpp b/src/box3d-context.cpp
index 5534aa410..37e9e210c 100644
--- a/src/box3d-context.cpp
+++ b/src/box3d-context.cpp
@@ -317,6 +317,7 @@ static gint sp_box3d_context_root_handler(SPEventContext *event_context, GdkEven
SnapManager &m = desktop->namedview->snap_manager;
m.setup(desktop, true, bc->item);
m.freeSnapReturnByRef(button_dt, Inkscape::SNAPSOURCE_NODE_HANDLE);
+ m.unSetup();
bc->center = from_2geom(button_dt);
sp_canvas_item_grab(SP_CANVAS_ITEM(desktop->acetate),
@@ -349,7 +350,6 @@ static gint sp_box3d_context_root_handler(SPEventContext *event_context, GdkEven
SnapManager &m = desktop->namedview->snap_manager;
m.setup(desktop, true, bc->item);
m.freeSnapReturnByRef(motion_dt, Inkscape::SNAPSOURCE_NODE_HANDLE);
-
bc->ctrl_dragged = event->motion.state & GDK_CONTROL_MASK;
if (event->motion.state & GDK_SHIFT_MASK && !bc->extruded && bc->item) {
@@ -383,6 +383,7 @@ static gint sp_box3d_context_root_handler(SPEventContext *event_context, GdkEven
}
m.freeSnapReturnByRef(bc->drag_ptC, Inkscape::SNAPSOURCE_NODE_HANDLE);
}
+ m.unSetup();
sp_box3d_drag(*bc, event->motion.state);
@@ -394,6 +395,7 @@ static gint sp_box3d_context_root_handler(SPEventContext *event_context, GdkEven
Geom::Point const motion_w(event->motion.x, event->motion.y);
Geom::Point motion_dt(desktop->w2d(motion_w));
m.preSnap(Inkscape::SnapCandidatePoint(motion_dt, Inkscape::SNAPSOURCE_NODE_HANDLE));
+ m.unSetup();
}
break;
case GDK_BUTTON_RELEASE: