diff options
| author | Nicolas Dufour <nicoduf@yahoo.fr> | 2012-11-23 19:46:45 +0000 |
|---|---|---|
| committer | JazzyNico <nicoduf@yahoo.fr> | 2012-11-23 19:46:45 +0000 |
| commit | f36cbed4b3f685a59f69dfd7b4534fe5a8da4bcf (patch) | |
| tree | 8c6ff591674d8b28187f04ebf4f3595aff814a65 /src/display | |
| parent | Translations. Ukrainian translation update by Yuri Chornoivan. (diff) | |
| download | inkscape-f36cbed4b3f685a59f69dfd7b4534fe5a8da4bcf.tar.gz inkscape-f36cbed4b3f685a59f69dfd7b4534fe5a8da4bcf.zip | |
UI. Fix for Bug #1072007 (Mouse scroll zoom depends on if the cursor is over an object).
(bzr r11893)
Diffstat (limited to 'src/display')
| -rw-r--r-- | src/display/canvas-arena.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/display/canvas-arena.cpp b/src/display/canvas-arena.cpp index 809f14500..8e25c1843 100644 --- a/src/display/canvas-arena.cpp +++ b/src/display/canvas-arena.cpp @@ -316,13 +316,17 @@ 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) { + case GDK_SCROLL: { + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); + bool wheelzooms = prefs->getBool("/options/wheelzooms/value"); + bool ctrl = (event->scroll.state & GDK_CONTROL_MASK); + if ((ctrl && !wheelzooms) || (!ctrl && wheelzooms)) { /* 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 */ |