summaryrefslogtreecommitdiffstats
path: root/src/display/sp-canvas.cpp
diff options
context:
space:
mode:
authorDiederik van Lierop <mailat-signdiedenrezidotnl>2010-03-21 19:46:45 +0000
committerDiederik van Lierop <mailat-signdiedenrezidotnl>2010-03-21 19:46:45 +0000
commita6aa217d30fff785d2812be8b566dfa2b66c8bce (patch)
tree9d0131ce2b7fe69d53ac03ccdbf52370fc1be343 /src/display/sp-canvas.cpp
parentEdit single-stop "swatch"/"solid" gradients in-place in the F&S dialog. (diff)
downloadinkscape-a6aa217d30fff785d2812be8b566dfa2b66c8bce.tar.gz
inkscape-a6aa217d30fff785d2812be8b566dfa2b66c8bce.zip
Fix regression caused by rev. #9158 (selection of nodes in the node editor by dragging a rectangle using a tablet was broken)
(bzr r9219)
Diffstat (limited to 'src/display/sp-canvas.cpp')
-rw-r--r--src/display/sp-canvas.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/display/sp-canvas.cpp b/src/display/sp-canvas.cpp
index 446066d93..c6778c8c5 100644
--- a/src/display/sp-canvas.cpp
+++ b/src/display/sp-canvas.cpp
@@ -1332,7 +1332,11 @@ emit_event (SPCanvas *canvas, GdkEvent *event)
// lost event. We can't wait for idle events to have current_item updated, we need it now!
// Otherwise, scrolling when hovering above a pre-snap indicator won't work (for example)
// See this bug report: https://bugs.launchpad.net/inkscape/+bug/522335/comments/8
- if (canvas->need_repick && !canvas->in_repick) {
+ if (canvas->need_repick && !canvas->in_repick && event->type == GDK_SCROLL) {
+ // To avoid side effects, we'll only do this for scroll events, because this is the
+ // only thing we want to fix here. An example of a reported side effect is that
+ // otherwise selection of nodes in the node editor by dragging a rectangle using a
+ // tablet will break
canvas->need_repick = FALSE;
pick_current_item (canvas, (GdkEvent *) event);
}