Scroller.st
changeset 1514 b819aca5ab4b
parent 1507 c712eb1a247e
child 1518 6d8e1461f119
--- a/Scroller.st	Thu May 07 19:39:21 1998 +0200
+++ b/Scroller.st	Thu May 07 19:41:44 1998 +0200
@@ -1200,13 +1200,14 @@
      If either shift is pressed, or the 'scrollerMiddleButtonJump' styleSheet
      value is true and its the middle button, do a jump to the clicked position."
 
-    |curr limit1 limit2|
+    |curr limit1 limit2 sensor|
 
     shown ifFalse:[^ self].
 
     scrolling ifTrue:[^ self].
 
-    ((self sensor shiftDown)
+    sensor := self sensor.
+    (((sensor notNil and:[sensor shiftDown]))
     or:[DefaultMiddleButtonJump and:[button == 2]]) ifTrue:[
         ^ self buttonShiftPress:button x:x y:y
     ].
@@ -1244,8 +1245,8 @@
     self highlightThumbForPointerX:x y:y.
     self changeCursorFor:(x@y).
 
-    "Modified: / 19.1.1998 / 13:45:08 / cg"
     "Modified: / 2.2.1998 / 23:30:26 / stefan"
+    "Modified: / 7.5.1998 / 02:05:41 / cg"
 !
 
 buttonRelease:button x:x y:y
@@ -1353,7 +1354,7 @@
     ] ifFalse:[
         sensor := self sensor.
 
-        (((frm containsPoint:p) and:[sensor leftButtonPressed])
+        (((frm containsPoint:p) and:[sensor notNil and:[sensor leftButtonPressed]])
          or:[sensor notNil and:[sensor shiftDown]]) ifTrue:[ 
             orientation == #horizontal ifTrue:[
                 which := #xMarker
@@ -1386,8 +1387,8 @@
     ].
     self cursor:(Cursor perform:which).
 
-    "Created: 23.10.1997 / 03:55:24 / cg"
-    "Modified: 23.10.1997 / 04:19:08 / cg"
+    "Created: / 23.10.1997 / 03:55:24 / cg"
+    "Modified: / 7.5.1998 / 02:06:10 / cg"
 !
 
 highlightThumbForPointerX:x y:y
@@ -2123,5 +2124,5 @@
 !Scroller class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/Scroller.st,v 1.102 1998-04-27 08:07:12 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/Scroller.st,v 1.103 1998-05-07 17:41:44 cg Exp $'
 ! !