--- a/FramedBox.st Wed May 29 16:16:35 1996 +0200
+++ b/FramedBox.st Wed May 29 16:38:27 1996 +0200
@@ -266,10 +266,10 @@
(font ~= aFont) ifTrue:[
super font:aFont.
- self redrawIfShown
+ self invalidate
]
- "Modified: 22.5.1996 / 12:36:20 / cg"
+ "Modified: 29.5.1996 / 16:17:50 / cg"
!
foregroundColor
@@ -282,9 +282,11 @@
"set the frame labels foreground color"
aColor ~= fgColor ifTrue:[
- fgColor := aColor.
- self redrawIfShown
+ fgColor := aColor.
+ self invalidate
]
+
+ "Modified: 29.5.1996 / 16:17:54 / cg"
!
frameShown
@@ -341,15 +343,16 @@
"set the frames labelstring"
(label ~= aString) ifTrue:[
- aString isEmpty ifTrue:[
- label := nil
- ] ifFalse:[
- label := aString.
- ].
- self redrawIfShown
+ aString isEmpty ifTrue:[
+ label := nil
+ ] ifFalse:[
+ label := aString.
+ ].
+ self invalidate
]
"Modified: 5.9.1995 / 17:20:05 / claus"
+ "Modified: 29.5.1996 / 16:17:56 / cg"
!
labelPosition
@@ -362,13 +365,15 @@
labelPosition:aSymbol
"define the position of the label;
aSymbol may be one of:
- #topLeft, #topCenter, #topRight;
- #bottomLeft, #bottomCenter or #bottomRight"
+ #topLeft, #topCenter, #topRight;
+ #bottomLeft, #bottomCenter or #bottomRight"
labelPosition ~~ aSymbol ifTrue:[
- labelPosition := aSymbol.
- self redrawIfShown
+ labelPosition := aSymbol.
+ self invalidate
]
+
+ "Modified: 29.5.1996 / 16:17:58 / cg"
!
layout
@@ -404,9 +409,11 @@
without a frame, only the label is shown at its position"
aBoolean ~~ showFrame ifTrue:[
- showFrame := aBoolean.
- self redrawIfShown
+ showFrame := aBoolean.
+ self invalidate
]
+
+ "Modified: 29.5.1996 / 16:17:59 / cg"
!
verticalSpace
@@ -542,8 +549,10 @@
!FramedBox methodsFor:'event handling'!
sizeChanged:how
- self redrawIfShown.
+ self invalidate.
super sizeChanged:how
+
+ "Modified: 29.5.1996 / 16:18:13 / cg"
! !
!FramedBox methodsFor:'initialization'!
@@ -574,15 +583,6 @@
"Modified: 10.1.1996 / 14:38:40 / cg"
! !
-!FramedBox methodsFor:'private'!
-
-redrawIfShown
- shown ifTrue:[
- self clear.
- self redraw
- ]
-! !
-
!FramedBox methodsFor:'queries'!
preferredExtent
@@ -650,5 +650,5 @@
!FramedBox class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg/FramedBox.st,v 1.26 1996-05-29 10:17:11 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg/FramedBox.st,v 1.27 1996-05-29 14:35:34 cg Exp $'
! !
--- a/ListView.st Wed May 29 16:16:35 1996 +0200
+++ b/ListView.st Wed May 29 16:38:27 1996 +0200
@@ -358,13 +358,14 @@
"set the background color"
bgColor ~~ aColor ifTrue:[
- bgColor := aColor.
- self viewBackground:bgColor.
- shown ifTrue:[
- self clear.
- self redraw
- ]
+ bgColor := aColor.
+ self viewBackground:bgColor.
+ shown ifTrue:[
+ self invalidate "/ clear; redraw
+ ]
]
+
+ "Modified: 29.5.1996 / 16:18:48 / cg"
!
font:aFont
@@ -406,23 +407,27 @@
"set the foreground color"
fgColor ~~ aColor ifTrue:[
- fgColor := aColor.
- shown ifTrue:[
- self redraw
- ]
+ fgColor := aColor.
+ shown ifTrue:[
+ self invalidate
+ ]
]
+
+ "Modified: 29.5.1996 / 16:19:02 / cg"
!
foregroundColor:color1 backgroundColor:color2
"set both foreground and background colors"
((fgColor ~~ color1) or:[bgColor ~~ color2]) ifTrue:[
- fgColor := color1.
- bgColor := color2.
- shown ifTrue:[
- self redraw
- ]
+ fgColor := color1.
+ bgColor := color2.
+ shown ifTrue:[
+ self invalidate
+ ]
]
+
+ "Modified: 29.5.1996 / 16:19:05 / cg"
!
innerHeight
@@ -1331,13 +1336,14 @@
|listSize newOrigin|
super sizeChanged:how.
+
self computeNumberOfLinesShown.
innerWidth := width - textStartLeft - margin.
shown ifFalse:[^ self].
list isNil ifTrue:[^ self].
- how ~~ #smaller ifTrue:[self redraw].
+ how ~~ #smaller ifTrue:[self invalidate ].
listSize := self numberOfLines.
"
@@ -1352,7 +1358,7 @@
^ self
].
- "Modified: 14.5.1996 / 18:45:56 / cg"
+ "Modified: 29.5.1996 / 16:19:23 / cg"
! !
!ListView methodsFor:'initialization'!
@@ -3248,5 +3254,5 @@
!ListView class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg/ListView.st,v 1.93 1996-05-29 12:56:00 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg/ListView.st,v 1.94 1996-05-29 14:36:15 cg Exp $'
! !
--- a/ObjView.st Wed May 29 16:16:35 1996 +0200
+++ b/ObjView.st Wed May 29 16:38:27 1996 +0200
@@ -346,27 +346,31 @@
do redraw"
something size > (contents size / 4) ifTrue:[
- "
- better to remove first, then redraw rest
- "
- self forEach:something do:[:anObject |
- self removeFromSelection:anObject.
- contents remove:anObject.
- ].
- self redraw.
- ^ self
+ "
+ better to remove first, then redraw rest
+ "
+ self forEach:something do:[:anObject |
+ self removeFromSelection:anObject.
+ contents remove:anObject.
+ ].
+ self invalidate.
+ ^ self
].
self forEach:something do:[:anObject |
- self removeObject:anObject
+ self removeObject:anObject
]
+
+ "Modified: 29.5.1996 / 16:20:24 / cg"
!
removeAll
"remove all - redraw"
self removeAllWithoutRedraw.
- self redraw
+ self invalidate
+
+ "Modified: 29.5.1996 / 16:20:28 / cg"
!
removeAllWithoutRedraw
@@ -1523,17 +1527,18 @@
gridPixmap := nil.
shown ifTrue:[
- self viewBackground:White.
- self clear.
+ self viewBackground:White.
+ self clear.
].
gridShown ifTrue:[
- self defineGrid.
- self viewBackground:gridPixmap.
+ self defineGrid.
+ self viewBackground:gridPixmap.
].
- shown ifTrue:[
- self redraw
- ].
+
+ self invalidate
+
+ "Modified: 29.5.1996 / 16:20:11 / cg"
!
showGrid
@@ -1852,14 +1857,15 @@
or 'letter'. See widthOfContentsInMM for supported formats."
aFormatString ~= documentFormat ifTrue:[
- documentFormat := aFormatString.
- self contentsChanged.
- self defineGrid.
- gridShown ifTrue:[
- self clear.
- self redraw
- ]
+ documentFormat := aFormatString.
+ self contentsChanged.
+ self defineGrid.
+ gridShown ifTrue:[
+ self invalidate "/ clear; redraw
+ ]
]
+
+ "Modified: 29.5.1996 / 16:19:44 / cg"
!
forEach:aCollection do:aBlock
@@ -2314,11 +2320,11 @@
]
].
(new and:[redraw]) ifTrue:[
- self redraw
+ self invalidate
]
]
- "Modified: 14.12.1995 / 20:59:49 / cg"
+ "Modified: 29.5.1996 / 16:19:58 / cg"
!
initializeFileInObject:anObject
@@ -2740,32 +2746,33 @@
|current|
transformation isNil ifTrue:[
- current := 1@1
+ current := 1@1
] ifFalse:[
- current := transformation scale
+ current := transformation scale
].
factor asPoint = current asPoint ifTrue:[
- ^ self
+ ^ self
].
current := factor.
current isNil ifTrue:[
- current := 1
+ current := 1
].
(current = 1) ifTrue:[
- transformation := nil
+ transformation := nil
] ifFalse:[
- transformation := WindowingTransformation scale:current translation:0.
+ transformation := WindowingTransformation scale:current translation:0.
].
self contentsChanged.
self setInnerClip.
gridShown ifTrue:[
- self newGrid
+ self newGrid
].
shown ifTrue:[
- self clear.
- self redraw
+ self invalidate "/ clear; redraw
].
+
+ "Modified: 29.5.1996 / 16:20:41 / cg"
!
zoomIn
@@ -2783,9 +2790,10 @@
translation:0.
self contentsChanged.
self setInnerClip.
- self redraw.
+ self invalidate.
"Created: 27.4.1996 / 10:08:39 / cg"
+ "Modified: 29.5.1996 / 16:20:46 / cg"
!
zoomOut
@@ -2803,13 +2811,14 @@
translation:0.
self contentsChanged.
self setInnerClip.
- self redraw
+ self invalidate
"Created: 27.4.1996 / 10:09:19 / cg"
+ "Modified: 29.5.1996 / 16:20:49 / cg"
! !
!ObjectView class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg/Attic/ObjView.st,v 1.40 1996-05-28 18:06:42 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg/Attic/ObjView.st,v 1.41 1996-05-29 14:37:04 cg Exp $'
! !
--- a/ObjectView.st Wed May 29 16:16:35 1996 +0200
+++ b/ObjectView.st Wed May 29 16:38:27 1996 +0200
@@ -346,27 +346,31 @@
do redraw"
something size > (contents size / 4) ifTrue:[
- "
- better to remove first, then redraw rest
- "
- self forEach:something do:[:anObject |
- self removeFromSelection:anObject.
- contents remove:anObject.
- ].
- self redraw.
- ^ self
+ "
+ better to remove first, then redraw rest
+ "
+ self forEach:something do:[:anObject |
+ self removeFromSelection:anObject.
+ contents remove:anObject.
+ ].
+ self invalidate.
+ ^ self
].
self forEach:something do:[:anObject |
- self removeObject:anObject
+ self removeObject:anObject
]
+
+ "Modified: 29.5.1996 / 16:20:24 / cg"
!
removeAll
"remove all - redraw"
self removeAllWithoutRedraw.
- self redraw
+ self invalidate
+
+ "Modified: 29.5.1996 / 16:20:28 / cg"
!
removeAllWithoutRedraw
@@ -1523,17 +1527,18 @@
gridPixmap := nil.
shown ifTrue:[
- self viewBackground:White.
- self clear.
+ self viewBackground:White.
+ self clear.
].
gridShown ifTrue:[
- self defineGrid.
- self viewBackground:gridPixmap.
+ self defineGrid.
+ self viewBackground:gridPixmap.
].
- shown ifTrue:[
- self redraw
- ].
+
+ self invalidate
+
+ "Modified: 29.5.1996 / 16:20:11 / cg"
!
showGrid
@@ -1852,14 +1857,15 @@
or 'letter'. See widthOfContentsInMM for supported formats."
aFormatString ~= documentFormat ifTrue:[
- documentFormat := aFormatString.
- self contentsChanged.
- self defineGrid.
- gridShown ifTrue:[
- self clear.
- self redraw
- ]
+ documentFormat := aFormatString.
+ self contentsChanged.
+ self defineGrid.
+ gridShown ifTrue:[
+ self invalidate "/ clear; redraw
+ ]
]
+
+ "Modified: 29.5.1996 / 16:19:44 / cg"
!
forEach:aCollection do:aBlock
@@ -2314,11 +2320,11 @@
]
].
(new and:[redraw]) ifTrue:[
- self redraw
+ self invalidate
]
]
- "Modified: 14.12.1995 / 20:59:49 / cg"
+ "Modified: 29.5.1996 / 16:19:58 / cg"
!
initializeFileInObject:anObject
@@ -2740,32 +2746,33 @@
|current|
transformation isNil ifTrue:[
- current := 1@1
+ current := 1@1
] ifFalse:[
- current := transformation scale
+ current := transformation scale
].
factor asPoint = current asPoint ifTrue:[
- ^ self
+ ^ self
].
current := factor.
current isNil ifTrue:[
- current := 1
+ current := 1
].
(current = 1) ifTrue:[
- transformation := nil
+ transformation := nil
] ifFalse:[
- transformation := WindowingTransformation scale:current translation:0.
+ transformation := WindowingTransformation scale:current translation:0.
].
self contentsChanged.
self setInnerClip.
gridShown ifTrue:[
- self newGrid
+ self newGrid
].
shown ifTrue:[
- self clear.
- self redraw
+ self invalidate "/ clear; redraw
].
+
+ "Modified: 29.5.1996 / 16:20:41 / cg"
!
zoomIn
@@ -2783,9 +2790,10 @@
translation:0.
self contentsChanged.
self setInnerClip.
- self redraw.
+ self invalidate.
"Created: 27.4.1996 / 10:08:39 / cg"
+ "Modified: 29.5.1996 / 16:20:46 / cg"
!
zoomOut
@@ -2803,13 +2811,14 @@
translation:0.
self contentsChanged.
self setInnerClip.
- self redraw
+ self invalidate
"Created: 27.4.1996 / 10:09:19 / cg"
+ "Modified: 29.5.1996 / 16:20:49 / cg"
! !
!ObjectView class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg/ObjectView.st,v 1.40 1996-05-28 18:06:42 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg/ObjectView.st,v 1.41 1996-05-29 14:37:04 cg Exp $'
! !
--- a/PullDMenu.st Wed May 29 16:16:35 1996 +0200
+++ b/PullDMenu.st Wed May 29 16:38:27 1996 +0200
@@ -570,19 +570,20 @@
titles := Array new:numberOfLabels.
titleArray keysAndValuesDo:[:index :entry |
- |e|
+ |e|
- entry isImage ifTrue:[
- e := entry on:device
- ] ifFalse:[
- e := entry printString
- ].
- titles at:index put:e
+ entry isImage ifTrue:[
+ e := entry on:device
+ ] ifFalse:[
+ e := entry printString
+ ].
+ titles at:index put:e
].
shown ifTrue:[
- self clear.
- self redraw
+ self invalidate "/ clear; redraw
]
+
+ "Modified: 29.5.1996 / 16:21:00 / cg"
!
labels:titleArray selectors:selectorArray
@@ -701,9 +702,11 @@
showSeparatingLines := aBoolean.
shown ifTrue:[
- self setMenuOrigins.
- self redraw
+ self setMenuOrigins.
+ self invalidate
]
+
+ "Modified: 29.5.1996 / 16:21:06 / cg"
! !
!PullDownMenu methodsFor:'drawing '!
@@ -1529,5 +1532,5 @@
!PullDownMenu class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg/Attic/PullDMenu.st,v 1.57 1996-05-29 10:22:21 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg/Attic/PullDMenu.st,v 1.58 1996-05-29 14:37:45 cg Exp $'
! !
--- a/PullDownMenu.st Wed May 29 16:16:35 1996 +0200
+++ b/PullDownMenu.st Wed May 29 16:38:27 1996 +0200
@@ -570,19 +570,20 @@
titles := Array new:numberOfLabels.
titleArray keysAndValuesDo:[:index :entry |
- |e|
+ |e|
- entry isImage ifTrue:[
- e := entry on:device
- ] ifFalse:[
- e := entry printString
- ].
- titles at:index put:e
+ entry isImage ifTrue:[
+ e := entry on:device
+ ] ifFalse:[
+ e := entry printString
+ ].
+ titles at:index put:e
].
shown ifTrue:[
- self clear.
- self redraw
+ self invalidate "/ clear; redraw
]
+
+ "Modified: 29.5.1996 / 16:21:00 / cg"
!
labels:titleArray selectors:selectorArray
@@ -701,9 +702,11 @@
showSeparatingLines := aBoolean.
shown ifTrue:[
- self setMenuOrigins.
- self redraw
+ self setMenuOrigins.
+ self invalidate
]
+
+ "Modified: 29.5.1996 / 16:21:06 / cg"
! !
!PullDownMenu methodsFor:'drawing '!
@@ -1529,5 +1532,5 @@
!PullDownMenu class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg/PullDownMenu.st,v 1.57 1996-05-29 10:22:21 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg/PullDownMenu.st,v 1.58 1996-05-29 14:37:45 cg Exp $'
! !
--- a/Scroller.st Wed May 29 16:16:35 1996 +0200
+++ b/Scroller.st Wed May 29 16:38:27 1996 +0200
@@ -819,14 +819,16 @@
thumbColor := aColor on:device.
(styleSheet name ~~ #normal) ifTrue:[
- thumbShadowColor := aColor darkened on:device.
- thumbLightColor := aColor lightened on:device.
- thumbHalfShadowColor := thumbShadowColor darkened on:device.
- thumbHalfLightColor := thumbLightColor lightened on:device.
+ thumbShadowColor := aColor darkened on:device.
+ thumbLightColor := aColor lightened on:device.
+ thumbHalfShadowColor := thumbShadowColor darkened on:device.
+ thumbHalfLightColor := thumbLightColor lightened on:device.
].
shown ifTrue:[
- self redraw
+ self invalidate
]
+
+ "Modified: 29.5.1996 / 16:21:42 / cg"
! !
!Scroller methodsFor:'drawing'!
@@ -1249,12 +1251,14 @@
|sensor|
shown ifTrue:[
- self computeThumbFrame.
- (sensor := self sensor) notNil ifTrue:[
- self redraw.
- sensor flushExposeEventsFor:self
- ]
+ self computeThumbFrame.
+ (sensor := self sensor) notNil ifTrue:[
+ sensor flushExposeEventsFor:self.
+ self invalidate.
+ ]
]
+
+ "Modified: 29.5.1996 / 16:21:36 / cg"
!
update:something with:aParameter from:changedObject
@@ -1776,5 +1780,5 @@
!Scroller class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg/Scroller.st,v 1.58 1996-05-29 10:19:57 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg/Scroller.st,v 1.59 1996-05-29 14:38:27 cg Exp $'
! !