--- a/ArrowButton.st Sat May 18 18:35:43 1996 +0200
+++ b/ArrowButton.st Mon May 20 10:44:35 1996 +0200
@@ -195,16 +195,16 @@
use cached form, if device is appropriate
"
CachedStyle ~~ style ifTrue:[
- UpArrowForm := DownArrowForm := LeftArrowForm := RightArrowForm := nil
+ UpArrowForm := DownArrowForm := LeftArrowForm := RightArrowForm := nil
].
((aDevice == Display) and:[DownArrowForm notNil]) ifTrue:[
- ^ DownArrowForm
+ ^ DownArrowForm
].
DownArrowForm := StyleSheet at:'arrowButtonDownForm' default:nil.
DownArrowForm notNil ifTrue:[
- ^ DownArrowForm
+ ^ DownArrowForm
].
"
@@ -213,12 +213,12 @@
(i.e. they are computed instead of drawn from a bitmap)
"
style ~~ #st80 ifTrue:[
- DownArrowFormFile notNil ifTrue:[
- form := Form fromFile:DownArrowFormFile resolution:100 on:aDevice.
- form isNil ifTrue:[
- 'ARRBUTTON: no bitmapFile: ' infoPrint. DownArrowFormFile infoPrintNL.
- ]
- ]
+ DownArrowFormFile notNil ifTrue:[
+ form := Form fromFile:DownArrowFormFile resolution:100 on:aDevice.
+ form isNil ifTrue:[
+ 'ARRBUTTON: no bitmapFile: ' infoPrint. DownArrowFormFile infoPrintCR.
+ ]
+ ]
].
"
@@ -227,36 +227,36 @@
case of a bad installation)
"
form isNil ifTrue:[
- style == #st80 ifTrue:[
- form := Form width:9 height:9 depth:1 on:Display.
+ style == #st80 ifTrue:[
+ form := Form width:9 height:9 depth:1 on:Display.
form isNil ifTrue:[^ nil].
- form clear.
- form lineWidth:2.
- form capStyle:#round.
- form paint:(Color colorId:1).
- form displayLineFromX:0 y:2 toX:4 y:6.
- form displayLineFromX:4 y:6 toX:8 y:2
- ] ifFalse:[
- form := Form width:16 height:16
- fromArray:#[2r00000000 2r00000000
- 2r00001111 2r11110000
- 2r00001000 2r00010000
- 2r00001000 2r00010000
- 2r00001000 2r00010000
- 2r00001000 2r00010000
- 2r00001000 2r00010000
- 2r01111000 2r00011110
- 2r01000000 2r00000010
- 2r00100000 2r00000100
- 2r00010000 2r00001000
- 2r00001000 2r00010000
- 2r00000100 2r00100000
- 2r00000010 2r01000000
- 2r00000001 2r10000000
- 2r00000000 2r00000000]
- on:aDevice.
+ form clear.
+ form lineWidth:2.
+ form capStyle:#round.
+ form paint:(Color colorId:1).
+ form displayLineFromX:0 y:2 toX:4 y:6.
+ form displayLineFromX:4 y:6 toX:8 y:2
+ ] ifFalse:[
+ form := Form width:16 height:16
+ fromArray:#[2r00000000 2r00000000
+ 2r00001111 2r11110000
+ 2r00001000 2r00010000
+ 2r00001000 2r00010000
+ 2r00001000 2r00010000
+ 2r00001000 2r00010000
+ 2r00001000 2r00010000
+ 2r01111000 2r00011110
+ 2r01000000 2r00000010
+ 2r00100000 2r00000100
+ 2r00010000 2r00001000
+ 2r00001000 2r00010000
+ 2r00000100 2r00100000
+ 2r00000010 2r01000000
+ 2r00000001 2r10000000
+ 2r00000000 2r00000000]
+ on:aDevice.
form isNil ifTrue:[^ nil].
- ].
+ ].
].
form := form on:aDevice.
@@ -264,11 +264,13 @@
remember form for next use
"
(aDevice == Display) ifTrue:[
- CachedStyle := style.
- DownArrowForm := form
+ CachedStyle := style.
+ DownArrowForm := form
].
^ form
+
+ "Modified: 20.5.1996 / 10:31:05 / cg"
!
leftArrowButtonForm:style on:aDevice
@@ -280,16 +282,16 @@
use cached form, if device is appropriate
"
CachedStyle ~~ style ifTrue:[
- UpArrowForm := DownArrowForm := LeftArrowForm := RightArrowForm := nil
+ UpArrowForm := DownArrowForm := LeftArrowForm := RightArrowForm := nil
].
((aDevice == Display) and:[LeftArrowForm notNil]) ifTrue:[
- ^ LeftArrowForm
+ ^ LeftArrowForm
].
LeftArrowForm := StyleSheet at:'arrowButtonLeftForm' default:nil.
LeftArrowForm notNil ifTrue:[
- ^ LeftArrowForm
+ ^ LeftArrowForm
].
"
@@ -298,12 +300,12 @@
(i.e. they are computed instead of drawn from a bitmap)
"
style ~~ #st80 ifTrue:[
- LeftArrowFormFile notNil ifTrue:[
- form := Form fromFile:LeftArrowFormFile resolution:100 on:aDevice.
- form isNil ifTrue:[
- 'ARRBUTTON: no bitmapFile: ' infoPrint. LeftArrowFormFile infoPrintNL.
- ]
- ]
+ LeftArrowFormFile notNil ifTrue:[
+ form := Form fromFile:LeftArrowFormFile resolution:100 on:aDevice.
+ form isNil ifTrue:[
+ 'ARRBUTTON: no bitmapFile: ' infoPrint. LeftArrowFormFile infoPrintCR.
+ ]
+ ]
].
"
@@ -312,36 +314,36 @@
case of a bad installation)
"
form isNil ifTrue:[
- style == #st80 ifTrue:[
- form := Form width:9 height:9 depth:1 on:Display.
+ style == #st80 ifTrue:[
+ form := Form width:9 height:9 depth:1 on:Display.
form isNil ifTrue:[^ nil].
- form clear.
- form lineWidth:2.
- form capStyle:#round.
- form paint:(Color colorId:1).
- form displayLineFromX:6 y:0 toX:2 y:4.
- form displayLineFromX:2 y:4 toX:6 y:8.
- ] ifFalse:[
- form := Form width:16 height:16
- fromArray:#[2r00000000 2r00000000
- 2r00000001 2r10000000
- 2r00000010 2r10000000
- 2r00000100 2r10000000
- 2r00001000 2r11111110
- 2r00010000 2r00000010
- 2r00100000 2r00000010
- 2r01000000 2r00000010
- 2r01000000 2r00000010
- 2r00100000 2r00000010
- 2r00010000 2r00000010
- 2r00001000 2r11111110
- 2r00000100 2r10000000
- 2r00000010 2r10000000
- 2r00000001 2r10000000
- 2r00000000 2r00000000]
- on:aDevice.
+ form clear.
+ form lineWidth:2.
+ form capStyle:#round.
+ form paint:(Color colorId:1).
+ form displayLineFromX:6 y:0 toX:2 y:4.
+ form displayLineFromX:2 y:4 toX:6 y:8.
+ ] ifFalse:[
+ form := Form width:16 height:16
+ fromArray:#[2r00000000 2r00000000
+ 2r00000001 2r10000000
+ 2r00000010 2r10000000
+ 2r00000100 2r10000000
+ 2r00001000 2r11111110
+ 2r00010000 2r00000010
+ 2r00100000 2r00000010
+ 2r01000000 2r00000010
+ 2r01000000 2r00000010
+ 2r00100000 2r00000010
+ 2r00010000 2r00000010
+ 2r00001000 2r11111110
+ 2r00000100 2r10000000
+ 2r00000010 2r10000000
+ 2r00000001 2r10000000
+ 2r00000000 2r00000000]
+ on:aDevice.
form isNil ifTrue:[^ nil].
- ].
+ ].
].
form := form on:aDevice.
@@ -349,11 +351,13 @@
remember form for next use
"
(aDevice == Display) ifTrue:[
- CachedStyle := style.
- LeftArrowForm := form
+ CachedStyle := style.
+ LeftArrowForm := form
].
^ form
+
+ "Modified: 20.5.1996 / 10:31:07 / cg"
!
rightArrowButtonForm:style on:aDevice
@@ -365,16 +369,16 @@
use cached form, if device is appropriate
"
CachedStyle ~~ style ifTrue:[
- UpArrowForm := DownArrowForm := LeftArrowForm := RightArrowForm := nil
+ UpArrowForm := DownArrowForm := LeftArrowForm := RightArrowForm := nil
].
((aDevice == Display) and:[RightArrowForm notNil]) ifTrue:[
- ^ RightArrowForm
+ ^ RightArrowForm
].
RightArrowForm := StyleSheet at:'arrowButtonRightForm' default:nil.
RightArrowForm notNil ifTrue:[
- ^ RightArrowForm
+ ^ RightArrowForm
].
"
@@ -383,12 +387,12 @@
(i.e. they are computed instead of drawn from a bitmap)
"
style ~~ #st80 ifTrue:[
- RightArrowFormFile notNil ifTrue:[
- form := Form fromFile:RightArrowFormFile resolution:100 on:aDevice.
- form isNil ifTrue:[
- 'ARRBUTTON: no bitmapFile: ' infoPrint. RightArrowFormFile infoPrintNL.
- ]
- ]
+ RightArrowFormFile notNil ifTrue:[
+ form := Form fromFile:RightArrowFormFile resolution:100 on:aDevice.
+ form isNil ifTrue:[
+ 'ARRBUTTON: no bitmapFile: ' infoPrint. RightArrowFormFile infoPrintCR.
+ ]
+ ]
].
"
@@ -397,36 +401,36 @@
case of a bad installation)
"
form isNil ifTrue:[
- style == #st80 ifTrue:[
- form := Form width:9 height:9 depth:1 on:Display.
+ style == #st80 ifTrue:[
+ form := Form width:9 height:9 depth:1 on:Display.
form isNil ifTrue:[^ nil].
- form clear.
- form lineWidth:2.
- form capStyle:#round.
- form paint:(Color colorId:1).
- form displayLineFromX:2 y:0 toX:6 y:4.
- form displayLineFromX:6 y:4 toX:2 y:8
- ] ifFalse:[
- form := Form width:16 height:16
- fromArray:#[2r00000000 2r00000000
- 2r00000001 2r10000000
- 2r00000001 2r01000000
- 2r00000001 2r00100000
- 2r01111111 2r00010000
- 2r01000000 2r00001000
- 2r01000000 2r00000100
- 2r01000000 2r00000010
- 2r01000000 2r00000010
- 2r01000000 2r00000100
- 2r01000000 2r00001000
- 2r01111111 2r00010000
- 2r00000001 2r00100000
- 2r00000001 2r01000000
- 2r00000001 2r10000000
- 2r00000000 2r00000000]
- on:aDevice.
+ form clear.
+ form lineWidth:2.
+ form capStyle:#round.
+ form paint:(Color colorId:1).
+ form displayLineFromX:2 y:0 toX:6 y:4.
+ form displayLineFromX:6 y:4 toX:2 y:8
+ ] ifFalse:[
+ form := Form width:16 height:16
+ fromArray:#[2r00000000 2r00000000
+ 2r00000001 2r10000000
+ 2r00000001 2r01000000
+ 2r00000001 2r00100000
+ 2r01111111 2r00010000
+ 2r01000000 2r00001000
+ 2r01000000 2r00000100
+ 2r01000000 2r00000010
+ 2r01000000 2r00000010
+ 2r01000000 2r00000100
+ 2r01000000 2r00001000
+ 2r01111111 2r00010000
+ 2r00000001 2r00100000
+ 2r00000001 2r01000000
+ 2r00000001 2r10000000
+ 2r00000000 2r00000000]
+ on:aDevice.
form isNil ifTrue:[^ nil].
- ].
+ ].
].
form := form on:aDevice.
@@ -434,11 +438,13 @@
remember form for next use
"
(aDevice == Display) ifTrue:[
- CachedStyle := style.
- RightArrowForm := form
+ CachedStyle := style.
+ RightArrowForm := form
].
^ form
+
+ "Modified: 20.5.1996 / 10:31:10 / cg"
!
upArrowButtonForm:style on:aDevice
@@ -450,16 +456,16 @@
use cached form, if device is appropriate
"
CachedStyle ~~ style ifTrue:[
- UpArrowForm := DownArrowForm := LeftArrowForm := RightArrowForm := nil
+ UpArrowForm := DownArrowForm := LeftArrowForm := RightArrowForm := nil
].
((aDevice == Display) and:[UpArrowForm notNil]) ifTrue:[
- ^ UpArrowForm
+ ^ UpArrowForm
].
UpArrowForm := StyleSheet at:'arrowButtonUpForm' default:nil.
UpArrowForm notNil ifTrue:[
- ^ UpArrowForm
+ ^ UpArrowForm
].
"
@@ -468,12 +474,12 @@
(i.e. they are computed instead of drawn from a bitmap)
"
style ~~ #st80 ifTrue:[
- UpArrowFormFile notNil ifTrue:[
- form := Form fromFile:UpArrowFormFile resolution:100 on:aDevice.
- form isNil ifTrue:[
- 'ARRBUTTON: no bitmapFile: ' infoPrint. UpArrowFormFile infoPrintNL.
- ]
- ]
+ UpArrowFormFile notNil ifTrue:[
+ form := Form fromFile:UpArrowFormFile resolution:100 on:aDevice.
+ form isNil ifTrue:[
+ 'ARRBUTTON: no bitmapFile: ' infoPrint. UpArrowFormFile infoPrintCR.
+ ]
+ ]
].
"
@@ -482,36 +488,36 @@
case of a bad installation)
"
form isNil ifTrue:[
- style == #st80 ifTrue:[
- form := Form width:9 height:9 depth:1 on:aDevice.
- form isNil ifTrue:[^ nil].
- form clear.
- form lineWidth:2.
- form capStyle:#round.
- form paint:(Color colorId:1).
- form displayLineFromX:0 y:6 toX:4 y:2.
- form displayLineFromX:4 y:2 toX:8 y:6.
- ] ifFalse:[
- form := Form width:16 height:16
- fromArray:#[2r00000000 2r00000000
- 2r00000001 2r10000000
- 2r00000010 2r01000000
- 2r00000100 2r00100000
- 2r00001000 2r00010000
- 2r00010000 2r00001000
- 2r00100000 2r00000100
- 2r01000000 2r00000010
- 2r01111000 2r00011110
- 2r00001000 2r00010000
- 2r00001000 2r00010000
- 2r00001000 2r00010000
- 2r00001000 2r00010000
- 2r00001000 2r00010000
- 2r00001111 2r11110000
- 2r00000000 2r00000000]
- on:aDevice.
+ style == #st80 ifTrue:[
+ form := Form width:9 height:9 depth:1 on:aDevice.
form isNil ifTrue:[^ nil].
- ].
+ form clear.
+ form lineWidth:2.
+ form capStyle:#round.
+ form paint:(Color colorId:1).
+ form displayLineFromX:0 y:6 toX:4 y:2.
+ form displayLineFromX:4 y:2 toX:8 y:6.
+ ] ifFalse:[
+ form := Form width:16 height:16
+ fromArray:#[2r00000000 2r00000000
+ 2r00000001 2r10000000
+ 2r00000010 2r01000000
+ 2r00000100 2r00100000
+ 2r00001000 2r00010000
+ 2r00010000 2r00001000
+ 2r00100000 2r00000100
+ 2r01000000 2r00000010
+ 2r01111000 2r00011110
+ 2r00001000 2r00010000
+ 2r00001000 2r00010000
+ 2r00001000 2r00010000
+ 2r00001000 2r00010000
+ 2r00001000 2r00010000
+ 2r00001111 2r11110000
+ 2r00000000 2r00000000]
+ on:aDevice.
+ form isNil ifTrue:[^ nil].
+ ].
].
form := form on:aDevice.
@@ -520,11 +526,13 @@
remember form for next use
"
(aDevice == Display) ifTrue:[
- CachedStyle := style.
- UpArrowForm := form
+ CachedStyle := style.
+ UpArrowForm := form
].
^ form
+
+ "Modified: 20.5.1996 / 10:31:13 / cg"
!
updateStyleCache
@@ -750,5 +758,5 @@
!ArrowButton class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg/ArrowButton.st,v 1.24 1996-04-27 18:18:43 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg/ArrowButton.st,v 1.25 1996-05-20 08:44:35 cg Exp $'
! !