hg/stx-libwidg: comparison Scroller.st

equal deleted inserted replaced

-:bce92900f46d
+:6d8e1461f119
 		synchronousOperation shadowForm lightForm inset thumbShadowColor
 		thumbLightColor thumbEdgeStyle thumbHalfShadowColor
 		thumbHalfLightColor thumbEnteredColor thumbFrameSizeDifference
 		tallyLevel tallyMarks fixThumbHeight frameBeforeMove ghostColor
 		ghostFrameColor ghostLevel rangeStart rangeEnd rangeStep entered
-		thumbActiveLevel originBeforeMove'
+		thumbActiveLevel originBeforeMove thumbImage'
 	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
 		DefaultThumbEnteredColor DefaultThumbActiveLevel SnapBackDistance
-		DefaultMiddleButtonJump NewCursors'
+		DefaultMiddleButtonJump NewCursors DefaultThumbImage'
 	poolDictionaries:''
 	category:'Views-Interactors'
 !
 !Scroller class methodsFor:'documentation'!
 DefaultInset := StyleSheet at:'scroller.thumbInset' default:0.
 DefaultFixThumbHeight := StyleSheet at:'scroller.thumbFixHeight' default:false.
 DefaultEdgeStyle := StyleSheet at:'scroller.thumbEdgeStyle'.
 DefaultMiddleButtonJump := StyleSheet at:'scroller.middleButtonJump' default:false.
 NewCursors := StyleSheet at:'scroller.newCursors' default:true.
+DefaultThumbImage := StyleSheet at:'scroller.thumbImage'.
 StyleSheet fileReadFailed ifTrue:[
 DefaultViewBackground := Grey.
 DefaultThumbColor := White.
 DefaultThumbFrameColor := Black.
 "
 self updateStyleCache
 "
-"Modified: 23.10.1997 / 04:00:44 / cg"
+"Modified: / 12.5.1998 / 20:24:54 / cg"
 ! !
 !Scroller methodsFor:'accessing'!
 start
 lvl == 0 ifTrue:[
 thumbFrameColor notNil ifTrue:[
 self paint:thumbFrameColor.
 self displayRectangle:thumbFrame.
 ].
+thumbImage notNil ifTrue:[
+thumbImage displayOn:self x:l y:t
+].
 ^ self
 ].
 self drawEdgesForX:l y:t width:w height:h level:lvl
 shadow:thumbShadowColor light:thumbLightColor
 orientation == #vertical ifTrue:[
 self displayRectangleX:l y:t width:w"-1" height:h.
 ] ifFalse:[
 self displayRectangleX:l y:t width:w height:h"-1".
 ]
+].
+thumbImage notNil ifTrue:[
+thumbImage displayOn:self x:l y:t
 ].
 (tallyLevel == 0 or:[tallyMarks == 0]) ifTrue:[
 shadowForm notNil ifTrue:[
 handleX := l + ((w - 8) // 2).
 self displayLineFromX:x y:yT toX:x y:yB
 ]
 ]
 ]
-"Modified: 7.3.1997 / 17:02:50 / cg"
+"Modified: / 12.5.1998 / 20:39:52 / cg"
 !
 drawThumbBackgroundInX:x y:y width:w height:h
 "draw part of the thumbs background; defined as a separate
 method, to allow drawing of arbitrary patterns under thumb
 (DefaultThumbEnteredColor notNil or:[NewCursors]) ifTrue:[
 self enableMotionEvents.
 self enableEnterLeaveEvents.
 ].
+DefaultThumbImage notNil ifTrue:[
+thumbImage := DefaultThumbImage on:device.
+fixThumbHeight := true.
+].
 nm = #next ifTrue:[
 shadowForm := self class handleShadowFormOn:device.
 lightForm := self class handleLightFormOn:device
 ] ifFalse:[
 shadowForm := lightForm := nil
 drawableId notNil ifTrue:[
 self computeThumbFrame
 ]
-"Modified: / 29.10.1997 / 01:34:45 / cg"
+"Modified: / 12.5.1998 / 20:26:21 / cg"
 !
 initialize
 "initialize - setup instvars from defaults"
 fixThumbHeight ifTrue:[
 "have a fix-size thumb (i.e. mswindows style)"
 newSize1 := sz2 - (2 * inset).   "make it square"
+thumbImage notNil ifTrue:[
+newSize1 := (newSize1 max:(thumbImage height)) max:(thumbImage width)
+].
 thumbFrameSizeDifference := newSize1 - computedSize.
 ].
 "
 oops - if height does not relect real visibible area, we have to adjust the origin
 ]
 ]
 ]
 ].
 thumbFrame := Rectangle left:nx top:ny width:nw height:nh
+"Modified: / 12.5.1998 / 20:58:51 / cg"
 !
 percentFromAbs:absValue
 "given a number of pixels, compute percentage"
 ^ preferredExtent.
 "Modified: 19.7.1996 / 20:45:35 / cg"
 !
-thumbUsable
+thumbVisible
 "return true, if the thumb is usable i.e. its visible & movable.
-Used by the scrollBar to decide if it should hide the scroller."
+Can be used by the scrollBar to decide if it should hide the scroller."
+|m2|
 (thumbHeight >= 100) ifTrue:[^ false].
 self computeThumbFrame.
 thumbFrame isNil ifTrue:[^ false].
+m2 := margin * 2.
 orientation == #vertical ifTrue:[
-thumbFrame height >= (height - margin - margin) ifTrue:[^ false].
+thumbFrame height >= (height - m2) ifTrue:[^ false].
 ] ifFalse:[
-thumbFrame width >= (width - margin - margin) ifTrue:[^ false].
+thumbFrame width >= (width - m2) ifTrue:[^ false].
 ].
 ^ true
-"Modified: 7.3.1997 / 17:23:07 / cg"
+"Created: / 7.3.1997 / 21:10:23 / cg"
-"Created: 7.3.1997 / 21:09:51 / cg"
+"Modified: / 12.5.1998 / 20:21:00 / cg"
-!
-thumbVisible
-"return true, if the thumb is usable i.e. its visible & movable.
-Can be used by the scrollBar to decide if it should hide the scroller."
-(thumbHeight >= 100) ifTrue:[^ false].
-self computeThumbFrame.
-thumbFrame isNil ifTrue:[^ false].
-orientation == #vertical ifTrue:[
-thumbFrame height >= (height - margin - margin) ifTrue:[^ false].
-] ifFalse:[
-thumbFrame width >= (width - margin - margin) ifTrue:[^ false].
-].
-^ true
-"Modified: 7.3.1997 / 17:23:07 / cg"
-"Created: 7.3.1997 / 21:10:23 / cg"
 ! !
 !Scroller class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libwidg/Scroller.st,v 1.103 1998-05-07 17:41:44 cg Exp $'
+^ '$Header: /cvs/stx/stx/libwidg/Scroller.st,v 1.104 1998-05-12 18:59:41 cg Exp $'
 ! !

changeset 1518	6d8e1461f119
parent 1514	b819aca5ab4b
child 1531	c5f2cfee9998