diff options
| author | John Smith <john.smith7545@yahoo.com> | 2012-10-14 11:49:55 +0000 |
|---|---|---|
| committer | John Smith <john.smith7545@yahoo.com> | 2012-10-14 11:49:55 +0000 |
| commit | d03137a76998f8c3c25a5307f2d7087581ee06a6 (patch) | |
| tree | 1355d1ee34c27e91f96d7106cf2758142aee21e7 /src | |
| parent | Use filter primitive region in flood filter primitive, fixes regression. (diff) | |
| download | inkscape-d03137a76998f8c3c25a5307f2d7087581ee06a6.tar.gz inkscape-d03137a76998f8c3c25a5307f2d7087581ee06a6.zip | |
Fix for 657463 : Mousewheel zooming by two steps, not one
(bzr r11798)
Diffstat (limited to 'src')
| -rw-r--r-- | src/display/canvas-arena.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/display/canvas-arena.cpp b/src/display/canvas-arena.cpp index f0fd63ef4..809f14500 100644 --- a/src/display/canvas-arena.cpp +++ b/src/display/canvas-arena.cpp @@ -316,6 +316,14 @@ sp_canvas_arena_event (SPCanvasItem *item, GdkEvent *event) ret = sp_canvas_arena_send_event (arena, event); break; + case GDK_SCROLL: + if (event->scroll.state & GDK_CONTROL_MASK) { + /* Zoom is emitted by the canvas as well, ignore here */ + return FALSE; + } + ret = sp_canvas_arena_send_event (arena, event); + break; + default: /* Just send event */ ret = sp_canvas_arena_send_event (arena, event); |