diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2016-03-14 16:47:47 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2016-03-14 16:47:47 +0000 |
| commit | fee7ec667cc353e1efda6a1a92f1f4715836fa4f (patch) | |
| tree | 63fe115530cd3f8511b29cf2e250fcf23dc8fe08 /src/ui/tools/zoom-tool.cpp | |
| parent | update credits (diff) | |
| parent | "Relative to" option for node alignment. (diff) | |
| download | inkscape-fee7ec667cc353e1efda6a1a92f1f4715836fa4f.tar.gz inkscape-fee7ec667cc353e1efda6a1a92f1f4715836fa4f.zip | |
update to trunk
(bzr r13682.1.32)
Diffstat (limited to '')
| -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) |