class: SimpleView
authorClaus Gittinger <cg@exept.de>
Tue, 03 Jun 2014 18:19:48 +0200
changeset 6490 deef195b37b8
parent 6489 8955b81883e6
child 6493 7785d3d8458b
child 6523 b6dc0f5f499a
class: SimpleView changed: #mouseWheelMotion:x:y:amount:deltaTime: zoom with either ctrl or meta modifier + mouseWheel
SimpleView.st
--- a/SimpleView.st	Tue Jun 03 11:43:46 2014 +0200
+++ b/SimpleView.st	Tue Jun 03 18:19:48 2014 +0200
@@ -6220,34 +6220,34 @@
     sensor := self sensor.
 
     UserPreferences current allowMouseWheelZoom ifTrue:[
-	zoomInOrOut := sensor ctrlDown.
-	zoomInOrOut ifTrue:[
-	    self mouseWheelZoom:amount.
-	    ^ self.
-	].
+        zoomInOrOut := sensor ctrlDown or:[sensor metaDown].
+        zoomInOrOut ifTrue:[
+            self mouseWheelZoom:amount.
+            ^ self.
+        ].
     ].
 
     pageScroll := sensor shiftDown.
 
     pageScroll ifFalse:[
-	amountToScroll := self verticalScrollStep.
-	sensor shiftDown ifFalse:[
-	    amountToScroll := self scaleMouseWheelScrollAmount:amountToScroll.
-	]
+        amountToScroll := self verticalScrollStep.
+        sensor shiftDown ifFalse:[
+            amountToScroll := self scaleMouseWheelScrollAmount:amountToScroll.
+        ]
     ].
 
     amount > 0 ifTrue:[
-	pageScroll ifTrue:[
-	    self pageUp
-	] ifFalse:[
-	    self scrollUp:amountToScroll
-	]
+        pageScroll ifTrue:[
+            self pageUp
+        ] ifFalse:[
+            self scrollUp:amountToScroll
+        ]
     ] ifFalse:[
-	pageScroll ifTrue:[
-	    self pageDown
-	] ifFalse:[
-	    self scrollDown:amountToScroll
-	]
+        pageScroll ifTrue:[
+            self pageDown
+        ] ifFalse:[
+            self scrollDown:amountToScroll
+        ]
     ].
 
     "Modified: / 21.5.1999 / 19:58:42 / cg"
@@ -11224,11 +11224,11 @@
 !SimpleView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/SimpleView.st,v 1.753 2014-05-29 10:26:09 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/SimpleView.st,v 1.754 2014-06-03 16:19:48 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libview/SimpleView.st,v 1.753 2014-05-29 10:26:09 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/SimpleView.st,v 1.754 2014-06-03 16:19:48 cg Exp $'
 !
 
 version_SVN