summaryrefslogtreecommitdiffstats
path: root/src/svgpan_js.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/svgpan_js.h')
-rw-r--r--src/svgpan_js.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/svgpan_js.h b/src/svgpan_js.h
index 7cbbdfc..260d4f7 100644
--- a/src/svgpan_js.h
+++ b/src/svgpan_js.h
@@ -66,7 +66,7 @@
" windowWidth = 800;\n"
" windowHeight = 600;\n"
" }\n"
-" minZoom = Math.min(windowHeight/viewHeight,windowWidth/viewWidth);\n"
+" minZoom = Math.min(Math.min(viewHeight,windowHeight)/viewHeight,Math.min(viewWidth,windowWidth)/viewWidth);\n"
" maxZoom = minZoom+1.5;\n"
" zoomInFactor = Math.pow(maxZoom/minZoom,1.0/zoomSteps);\n"
" zoomOutFactor = 1.0/zoomInFactor;\n"
@@ -168,6 +168,7 @@
"function handleMouseWheel(evt) \n"
"{\n"
" if (!evt) evt = window.evt;\n"
+" if (!evt.shiftKey) return; // only zoom when shift is pressed\n"
" if (evt.preventDefault) evt.preventDefault();\n"
" evt.returnValue = false;\n"
"\n"