summaryrefslogtreecommitdiffstats
path: root/src/ui/tool/control-point.cpp
diff options
context:
space:
mode:
authorKrzysztof Kosi??ski <tweenk.pl@gmail.com>2010-10-31 23:17:32 +0000
committerKrzysztof KosiƄski <tweenk.pl@gmail.com>2010-10-31 23:17:32 +0000
commit75caaff0d0141c063f4592abaf36e8853f54e37c (patch)
tree73bbba4293ad393ed7dee93d447f920704224ae8 /src/ui/tool/control-point.cpp
parentOnly create / delete shape editors in the node tool when necessary. (diff)
downloadinkscape-75caaff0d0141c063f4592abaf36e8853f54e37c.tar.gz
inkscape-75caaff0d0141c063f4592abaf36e8853f54e37c.zip
Prevent context menu and keyboard shortcuts from interrupting grabs
(bzr r9869)
Diffstat (limited to 'src/ui/tool/control-point.cpp')
-rw-r--r--src/ui/tool/control-point.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/ui/tool/control-point.cpp b/src/ui/tool/control-point.cpp
index b74e3bc9c..28c679985 100644
--- a/src/ui/tool/control-point.cpp
+++ b/src/ui/tool/control-point.cpp
@@ -329,7 +329,7 @@ bool ControlPoint::_eventHandler(GdkEvent *event)
_setState(STATE_CLICKED);
return true;
}
- return false;
+ return _event_grab;
case GDK_2BUTTON_PRESS:
// store the button number for next release
@@ -452,8 +452,9 @@ bool ControlPoint::_eventHandler(GdkEvent *event)
default: break;
}
-
- return false;
+
+ // do not propagate events during grab - it might cause problems
+ return _event_grab;
}
void ControlPoint::_setMouseover(ControlPoint *p, unsigned state)