diff options
| author | Krzysztof Kosi??ski <tweenk.pl@gmail.com> | 2010-10-31 23:17:32 +0000 |
|---|---|---|
| committer | Krzysztof Kosiński <tweenk.pl@gmail.com> | 2010-10-31 23:17:32 +0000 |
| commit | 75caaff0d0141c063f4592abaf36e8853f54e37c (patch) | |
| tree | 73bbba4293ad393ed7dee93d447f920704224ae8 /src | |
| parent | Only create / delete shape editors in the node tool when necessary. (diff) | |
| download | inkscape-75caaff0d0141c063f4592abaf36e8853f54e37c.tar.gz inkscape-75caaff0d0141c063f4592abaf36e8853f54e37c.zip | |
Prevent context menu and keyboard shortcuts from interrupting grabs
(bzr r9869)
Diffstat (limited to 'src')
| -rw-r--r-- | src/knot.cpp | 2 | ||||
| -rw-r--r-- | src/ui/tool/control-point.cpp | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/knot.cpp b/src/knot.cpp index 10672e048..824f16c3e 100644 --- a/src/knot.cpp +++ b/src/knot.cpp @@ -447,7 +447,7 @@ static int sp_knot_handler(SPCanvasItem */*item*/, GdkEvent *event, SPKnot *knot g_object_unref(knot); - return consumed; + return consumed || grabbed; } void sp_knot_handler_request_position(GdkEvent *event, SPKnot *knot) 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) |