--- a/Scroller.st Tue Dec 19 10:56:59 1995 +0100
+++ b/Scroller.st Sat Dec 23 12:48:43 1995 +0100
@@ -11,24 +11,24 @@
"
View subclass:#Scroller
- instanceVariableNames:'thumbOrigin thumbHeight thumbColor thumbFrameColor scrollAction
- orientation thumbFrame thumbLevel scrolling pressOffset
- synchronousOperation shadowForm lightForm inset thumbShadowColor
- thumbLightColor thumbEdgeStyle thumbHalfShadowColor
- thumbHalfLightColor thumbFrameSizeDifference tallyLevel
- tallyMarks fixThumbHeight frameBeforeMove ghostColor
- ghostFrameColor ghostLevel rangeStart rangeEnd rangeStep'
- classVariableNames:'HandleShadowForm HandleLightForm DefaultViewBackground
- DefaultShadowColor DefaultLightColor DefaultThumbColor
- DefaultThumbShadowColor DefaultThumbLightColor
- DefaultThumbHalfShadowColor DefaultThumbHalfLightColor
- DefaultHalfShadowColor DefaultHalfLightColor DefaultTallyMarks
- DefaultTallyLevel DefaultLevel DefaultBorderWidth
- DefaultThumbLevel DefaultInset DefaultThumbFrameColor
- DefaultGhostColor DefaultGhostFrameColor DefaultGhostLevel
- DefaultFixThumbHeight DefaultEdgeStyle DefaultFullViewBackground'
- poolDictionaries:''
- category:'Views-Interactors'
+ instanceVariableNames:'thumbOrigin thumbHeight thumbColor thumbFrameColor scrollAction
+ orientation thumbFrame thumbLevel scrolling pressOffset
+ synchronousOperation shadowForm lightForm inset thumbShadowColor
+ thumbLightColor thumbEdgeStyle thumbHalfShadowColor
+ thumbHalfLightColor thumbFrameSizeDifference tallyLevel
+ tallyMarks fixThumbHeight frameBeforeMove ghostColor
+ ghostFrameColor ghostLevel rangeStart rangeEnd rangeStep'
+ classVariableNames:'HandleShadowForm HandleLightForm DefaultViewBackground
+ DefaultShadowColor DefaultLightColor DefaultThumbColor
+ DefaultThumbShadowColor DefaultThumbLightColor
+ DefaultThumbHalfShadowColor DefaultThumbHalfLightColor
+ DefaultHalfShadowColor DefaultHalfLightColor DefaultTallyMarks
+ DefaultTallyLevel DefaultLevel DefaultBorderWidth
+ DefaultThumbLevel DefaultInset DefaultThumbFrameColor
+ DefaultGhostColor DefaultGhostFrameColor DefaultGhostLevel
+ DefaultFixThumbHeight DefaultEdgeStyle DefaultFullViewBackground'
+ poolDictionaries:''
+ category:'Views-Interactors'
!
!Scroller class methodsFor:'documentation'!
@@ -1098,23 +1098,27 @@
|rect|
scrolling ifTrue:[
- frameBeforeMove notNil ifTrue:[
- rect := frameBeforeMove.
- frameBeforeMove := nil.
- self drawThumbBackgroundInX:rect left
- y:rect top
- width:rect width
- height:rect height.
- (rect intersects:thumbFrame) ifTrue:[
- self drawThumb
- ]
- ].
+ thumbFrame notNil ifTrue:[
+ frameBeforeMove notNil ifTrue:[
+ rect := frameBeforeMove.
+ frameBeforeMove := nil.
+ self drawThumbBackgroundInX:rect left
+ y:rect top
+ width:rect width
+ height:rect height.
+ (rect intersects:thumbFrame) ifTrue:[
+ self drawThumb
+ ]
+ ].
- scrolling := false.
- synchronousOperation ifFalse: [
- self tellOthers.
- ]
+ scrolling := false.
+ synchronousOperation ifFalse: [
+ self tellOthers.
+ ]
+ ]
]
+
+ "Modified: 23.12.1995 / 12:42:25 / cg"
!
buttonShiftPress:button x:x y:y
@@ -1548,5 +1552,5 @@
!Scroller class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg/Scroller.st,v 1.33 1995-12-07 22:25:03 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg/Scroller.st,v 1.34 1995-12-23 11:48:43 cg Exp $'
! !