summaryrefslogtreecommitdiffstats
path: root/src/display/sp-canvas.cpp
diff options
context:
space:
mode:
authorMartin Owens <doctormo@gmail.com>2014-01-21 15:21:10 +0000
committerMartin Owens <doctormo@gmail.com>2014-01-21 15:21:10 +0000
commit29e005620b05165ffd5ad21c2a9751adac89d34a (patch)
treec1c212cb5327fdc8f0dc10e4cfd5a1f38bfce4ed /src/display/sp-canvas.cpp
parentRevert last commit (breaks changing document units). (diff)
downloadinkscape-29e005620b05165ffd5ad21c2a9751adac89d34a.tar.gz
inkscape-29e005620b05165ffd5ad21c2a9751adac89d34a.zip
Move dragging undo block from tools-base to canvas. Regarding bug #168695
(bzr r12967)
Diffstat (limited to 'src/display/sp-canvas.cpp')
-rw-r--r--src/display/sp-canvas.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/display/sp-canvas.cpp b/src/display/sp-canvas.cpp
index 455f628bc..ff58cf453 100644
--- a/src/display/sp-canvas.cpp
+++ b/src/display/sp-canvas.cpp
@@ -1545,6 +1545,11 @@ int SPCanvasImpl::emitEvent(SPCanvas *canvas, GdkEvent *event)
default:
break;
}
+ // Block Undo and Redo while we drag /anything/
+ if(event->type == GDK_BUTTON_PRESS)
+ canvas->is_dragging = true;
+ else if(event->type == GDK_BUTTON_RELEASE)
+ canvas->is_dragging = false;
// Choose where we send the event