displayOpaque fixes
authorClaus Gittinger <cg@exept.de>
Mon, 11 Dec 1995 18:05:14 +0100
changeset 108 b228b94be590
parent 107 48ab2466447a
child 109 88467c13bf31
displayOpaque fixes
ClrListEntry.st
ColoredListEntry.st
ListEntry.st
MCLEntry.st
MultiColListEntry.st
--- a/ClrListEntry.st	Thu Dec 07 23:25:39 1995 +0100
+++ b/ClrListEntry.st	Mon Dec 11 18:05:14 1995 +0100
@@ -122,7 +122,7 @@
 
 !ColoredListEntry methodsFor:'drawing'!
 
-displayOn:aGC x:x y:y
+displayOn:aGC x:x y:y opaque:opaque
     "display the receiver on a GC"
 
     |savedPaint savedBgPaint|
@@ -135,7 +135,11 @@
 	aGC paint:savedPaint on:savedBgPaint
     ] ifFalse:[
 	aGC paint:color.
-	aGC displayString:(string withTabsExpanded) x:x y:y.
+	opaque ifTrue:[
+	    aGC displayOpaqueString:(string withTabsExpanded) x:x y:y.
+	] ifFalse:[
+	    aGC displayString:(string withTabsExpanded) x:x y:y.
+	].
 	aGC paint:savedPaint
     ]
 
@@ -153,5 +157,5 @@
 !ColoredListEntry class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg2/Attic/ClrListEntry.st,v 1.8 1995-11-23 18:09:12 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg2/Attic/ClrListEntry.st,v 1.9 1995-12-11 17:05:12 cg Exp $'
 ! !
--- a/ColoredListEntry.st	Thu Dec 07 23:25:39 1995 +0100
+++ b/ColoredListEntry.st	Mon Dec 11 18:05:14 1995 +0100
@@ -122,7 +122,7 @@
 
 !ColoredListEntry methodsFor:'drawing'!
 
-displayOn:aGC x:x y:y
+displayOn:aGC x:x y:y opaque:opaque
     "display the receiver on a GC"
 
     |savedPaint savedBgPaint|
@@ -135,7 +135,11 @@
 	aGC paint:savedPaint on:savedBgPaint
     ] ifFalse:[
 	aGC paint:color.
-	aGC displayString:(string withTabsExpanded) x:x y:y.
+	opaque ifTrue:[
+	    aGC displayOpaqueString:(string withTabsExpanded) x:x y:y.
+	] ifFalse:[
+	    aGC displayString:(string withTabsExpanded) x:x y:y.
+	].
 	aGC paint:savedPaint
     ]
 
@@ -153,5 +157,5 @@
 !ColoredListEntry class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg2/ColoredListEntry.st,v 1.8 1995-11-23 18:09:12 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg2/ColoredListEntry.st,v 1.9 1995-12-11 17:05:12 cg Exp $'
 ! !
--- a/ListEntry.st	Thu Dec 07 23:25:39 1995 +0100
+++ b/ListEntry.st	Mon Dec 11 18:05:14 1995 +0100
@@ -53,6 +53,20 @@
     ^ self asString
 ! !
 
+!ListEntry methodsFor:'drawing'!
+
+displayOpaqueOn:aGC x:x y:y
+    "display the receiver on a GC"
+
+    ^ self displayOn:aGC x:x y:y opaque:true
+!
+
+displayOn:aGC x:x y:y
+    "display the receiver on a GC"
+
+    ^ self displayOn:aGC x:x y:y opaque:false 
+! !
+
 !ListEntry methodsFor:'required protocol'!
 
 asString
@@ -61,7 +75,7 @@
     ^ self subclassResponsibility
 !
 
-displayOn:aGC x:x y:y
+displayOn:aGC x:x y:yopaque:opaque
     "display the receiver on a GC"
 
     ^ self subclassResponsibility
@@ -86,5 +100,5 @@
 !ListEntry class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg2/ListEntry.st,v 1.5 1995-11-23 18:09:01 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg2/ListEntry.st,v 1.6 1995-12-11 17:05:13 cg Exp $'
 ! !
--- a/MCLEntry.st	Thu Dec 07 23:25:39 1995 +0100
+++ b/MCLEntry.st	Mon Dec 11 18:05:14 1995 +0100
@@ -371,7 +371,7 @@
 
 !MultiColListEntry methodsFor:'drawing'!
 
-displayOn:aGC x:x y:y
+displayOn:aGC x:x y:y opaque:opaque
     "display the receiver on a GC"
 
     |xPos spec tabPos prevString|
@@ -396,7 +396,11 @@
 	    ] ifFalse:[
 		xPos := tabPos + x.
 	    ].
-	    aGC displayString:subString x:xPos y:y.
+	    opaque ifTrue:[    
+		aGC displayOpaqueString:subString x:xPos y:y.
+	    ] ifFalse:[    
+		aGC displayString:subString x:xPos y:y.
+	    ]    
 	    prevString := subString.
 	]
     ].
@@ -443,5 +447,5 @@
 !MultiColListEntry class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg2/Attic/MCLEntry.st,v 1.12 1995-11-24 20:54:55 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg2/Attic/MCLEntry.st,v 1.13 1995-12-11 17:05:14 cg Exp $'
 ! !
--- a/MultiColListEntry.st	Thu Dec 07 23:25:39 1995 +0100
+++ b/MultiColListEntry.st	Mon Dec 11 18:05:14 1995 +0100
@@ -371,7 +371,7 @@
 
 !MultiColListEntry methodsFor:'drawing'!
 
-displayOn:aGC x:x y:y
+displayOn:aGC x:x y:y opaque:opaque
     "display the receiver on a GC"
 
     |xPos spec tabPos prevString|
@@ -396,7 +396,11 @@
 	    ] ifFalse:[
 		xPos := tabPos + x.
 	    ].
-	    aGC displayString:subString x:xPos y:y.
+	    opaque ifTrue:[    
+		aGC displayOpaqueString:subString x:xPos y:y.
+	    ] ifFalse:[    
+		aGC displayString:subString x:xPos y:y.
+	    ]    
 	    prevString := subString.
 	]
     ].
@@ -443,5 +447,5 @@
 !MultiColListEntry class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg2/MultiColListEntry.st,v 1.12 1995-11-24 20:54:55 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg2/MultiColListEntry.st,v 1.13 1995-12-11 17:05:14 cg Exp $'
 ! !