--- a/SimpleView.st Sat Oct 24 15:52:02 2009 +0200
+++ b/SimpleView.st Sat Oct 24 15:58:50 2009 +0200
@@ -1877,13 +1877,20 @@
borderColor
"return my borderColor"
+ |clr|
+
(superView notNil and:[superView isBorderedWrapper]) ifTrue:[
^ superView borderColor
].
"/ ^ borderColor
- border isNil ifTrue:[ ^ nil ].
- ^ border color.
+ border notNil ifTrue:[
+ clr := border color
+ ].
+ clr isNil ifTrue:[
+ ^ Color black
+ ].
+ ^ clr.
"Modified: 5.6.1996 / 14:11:44 / cg"
!
@@ -1900,10 +1907,10 @@
aColor isNil ifTrue:[
border isNil ifTrue:[^ self].
- border := nil.
+ self border:nil.
] ifFalse:[
aColor = (self borderColor) ifTrue:[^ self].
- border := SimpleBorder new width:(self borderWidth) color:aColor
+ self border:(SimpleBorder new width:(self borderWidth) color:aColor)
].
self invalidate.
@@ -1939,6 +1946,20 @@
"Modified: 18.9.1997 / 11:09:40 / cg"
!
+borderWidth
+ "return my borderWidth"
+
+ (superView notNil and:[superView isBorderedWrapper]) ifTrue:[
+ ^ superView borderWidth
+ ].
+
+ border isNil ifTrue:[^ 0].
+ ^ border width ? 0
+
+ "Modified: 5.6.1996 / 14:11:57 / cg"
+ "Modified: 23.10.2009 / 14:11:50 / cg"
+!
+
borderWidth:aNumber
"set my borderWidth"
@@ -2107,6 +2128,7 @@
"set my borderWidth without affecting the real view (private only)"
"/ borderWidth := aNumber
+ self borderWidth:aNumber
!
shadowColor
@@ -5720,7 +5742,7 @@
self deviceClippingRectangle:nil.
oldPaint := paint.
border notNil ifTrue:[
- border displayOn:self forDisplayBox:innerClipRect.
+ border displayOn:self forDisplayBox:(Rectangle left:0 top:0 width:width height:height).
] ifFalse:[
(topEdge and:[leftEdge and:[botEdge and:[rightEdge]]]) ifTrue:[
self drawEdges
@@ -6895,8 +6917,7 @@
super initialize.
- font := self defaultFont.
- font := font onDevice:device.
+ font := self defaultFont onDevice:device.
shown := realized := false.
"/ hiddenOnRealize := false.
@@ -6910,7 +6931,7 @@
resources := myClass classResources.
level := margin := 0.
- self setBorderWidth:0.
+ self borderWidth:0.
self initStyle.
@@ -6927,8 +6948,8 @@
controllerClass := self defaultControllerClass.
controllerClass notNil ifTrue:[
- controller := controllerClass new.
- controller view:self.
+ controller := controllerClass new.
+ controller view:self.
].
self initializeMiddleButtonMenu.
@@ -6959,11 +6980,11 @@
self initStyle.
(drawableId notNil and:[gcId notNil]) ifTrue:[
- "force a change"
- t := self borderWidth. self setBorderWidth:nil. self borderWidth:t.
- t := viewBackground. viewBackground := nil. self viewBackground:t.
- self clearView.
- self invalidate.
+ "force a change"
+ t := self borderWidth. self borderWidth:nil. self borderWidth:t.
+ t := viewBackground. viewBackground := nil. self viewBackground:t.
+ self clearView.
+ self invalidate.
].
"Modified: / 18.9.1998 / 21:15:33 / cg"
@@ -7362,22 +7383,6 @@
^ aMenu startUpFor:self
! !
-!SimpleView methodsFor:'others'!
-
-borderWidth
- "return my borderWidth"
-
- (superView notNil and:[superView isBorderedWrapper]) ifTrue:[
- ^ superView borderWidth
- ].
-
- border isNil ifTrue:[^ 0].
- ^ border width ? 0
-
- "Modified: 5.6.1996 / 14:11:57 / cg"
- "Modified: 23.10.2009 / 14:11:50 / cg"
-! !
-
!SimpleView methodsFor:'private'!
componentsContainingX:x y:y do:aBlock
@@ -8790,20 +8795,20 @@
isInputOnly := self isInputOnly.
drawableId := device
- createWindowFor:self
- type:(self windowType)
- origin:(left @ top)
- extent:(width @ height)
- minExtent:nil
- maxExtent:nil
- borderWidth:self borderWidth
- subViewOf:sv
- style:(self windowStyle)
- inputOnly:isInputOnly
- label:nil
- owner:nil
- icon:nil iconMask:nil
- iconView:nil.
+ createWindowFor:self
+ type:(self windowType)
+ origin:(left @ top)
+ extent:(width @ height)
+ minExtent:nil
+ maxExtent:nil
+ borderWidth:0 "self borderWidth"
+ subViewOf:sv
+ style:(self windowStyle)
+ inputOnly:isInputOnly
+ label:nil
+ owner:nil
+ icon:nil iconMask:nil
+ iconView:nil.
Lobby registerChange:self.
@@ -8822,24 +8827,24 @@
"/ ]
"/ ].
(viewGravity notNil "and:[viewGravity ~~ #NorthWest]") ifTrue:[
- device setWindowGravity:viewGravity in:drawableId
+ device setWindowGravity:viewGravity in:drawableId
].
(bitGravity notNil "and:[bitGravity ~~ #NorthWest]") ifTrue:[
- isInputOnly ifFalse:[
- device setBitGravity:bitGravity in:drawableId
- ]
+ isInputOnly ifFalse:[
+ device setBitGravity:bitGravity in:drawableId
+ ]
].
viewShape notNil ifTrue:[
- self setViewShape
+ self setViewShape
].
(backed notNil and:[backed ~~ false]) ifTrue:[
- device setBackingStore:backed in:drawableId
+ device setBackingStore:backed in:drawableId
].
self saveUnder ifTrue:[
- device setSaveUnder:true in:drawableId
+ device setSaveUnder:true in:drawableId
].
cursor notNil ifTrue:[
- self setCursor
+ self setCursor
].
"Modified: / 9.4.1998 / 20:18:12 / cg"
@@ -10532,11 +10537,11 @@
!SimpleView class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview/SimpleView.st,v 1.644 2009-10-24 10:31:07 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/SimpleView.st,v 1.645 2009-10-24 13:58:50 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libview/SimpleView.st,v 1.644 2009-10-24 10:31:07 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/SimpleView.st,v 1.645 2009-10-24 13:58:50 cg Exp $'
! !
SimpleView initialize!