diff options
| author | Marc Jeanmougin <marc@jeanmougin.fr> | 2016-03-07 19:34:38 +0000 |
|---|---|---|
| committer | Marc Jeanmougin <marcjeanmougin@free.fr> | 2016-03-07 19:34:38 +0000 |
| commit | 0a0947876040165625941a4bccc1a788173121c0 (patch) | |
| tree | 425833ff7b29724ec2d6c01fa5c70c5d13380530 /src/ui/tools/zoom-tool.cpp | |
| parent | btool: Fix multiply included test file header (diff) | |
| download | inkscape-0a0947876040165625941a4bccc1a788173121c0.tar.gz inkscape-0a0947876040165625941a4bccc1a788173121c0.zip | |
does not zoom in to selection box if holding shift to zoom out
(bzr r14692)
Diffstat (limited to 'src/ui/tools/zoom-tool.cpp')
| -rw-r--r-- | src/ui/tools/zoom-tool.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ui/tools/zoom-tool.cpp b/src/ui/tools/zoom-tool.cpp index 6a4d4dbbd..13e097c18 100644 --- a/src/ui/tools/zoom-tool.cpp +++ b/src/ui/tools/zoom-tool.cpp @@ -142,7 +142,7 @@ bool ZoomTool::root_handler(GdkEvent* event) { if ( event->button.button == 1 && !this->space_panning) { Geom::OptRect const b = Inkscape::Rubberband::get(desktop)->getRectangle(); - if (b && !within_tolerance) { + if (b && !within_tolerance && !(GDK_SHIFT_MASK & event->button.state) ) { desktop->set_display_area(*b, 10); } else if (!escaped) { double const zoom_rel( (event->button.state & GDK_SHIFT_MASK) |