# HG changeset patch
# User Claus Gittinger <cg@exept.de>
# Date 1228323192 -3600
# Node ID b1161f2c78ca7055d2e421383837278b6ca0a652
# Parent  95d91d6d649cebe234f77287a134cd9bc2c894ef
*** empty log message ***

diff -r 95d91d6d649c -r b1161f2c78ca SimpleView.st
--- a/SimpleView.st	Wed Dec 03 17:42:03 2008 +0100
+++ b/SimpleView.st	Wed Dec 03 17:53:12 2008 +0100
@@ -5708,14 +5708,14 @@
     sensor := self sensor.
 
     UserPreferences current allowMouseWheelZoom ifTrue:[
-        zoomInOrOut := sensor metaDown.
+        zoomInOrOut := sensor ctrlDown.
         zoomInOrOut ifTrue:[        
             self mouseWheelZoom:amount.
             ^ self.
         ].
     ].
 
-    pageScroll := sensor ctrlDown.
+    pageScroll := sensor shiftDown.
 
     pageScroll ifFalse:[
         amountToScroll := self verticalScrollStep.
@@ -5742,7 +5742,20 @@
 !
 
 mouseWheelZoom:amount
-    "ignored here - redefined in views which can zoom"
+    "CTRL-wheel action.
+     ignored here - redefined in views which can zoom"
+
+"/    |oldScale newScale factor|
+"/
+"/    amount > 0 ifTrue:[
+"/        factor := 1.2.
+"/    ] ifFalse:[
+"/        factor := 0.8.
+"/    ].
+"/    oldScale := self scale.
+"/    newScale := (oldScale * factor) max:0.1.
+"/    self scale:newScale.
+"/    self invalidate.
 !
 
 pointerEnter:state x:x y:y
@@ -10244,7 +10257,7 @@
 !SimpleView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/SimpleView.st,v 1.603 2008-12-03 16:41:18 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/SimpleView.st,v 1.604 2008-12-03 16:53:12 cg Exp $'
 ! !
 
 SimpleView initialize!