selection highlighting with coloured text in the selection
authorClaus Gittinger <cg@exept.de>
Fri, 10 Dec 1999 13:45:30 +0100
changeset 2082 d3ccb78e8c03
parent 2081 7a72a50c0f22
child 2083 831afc5e2684
selection highlighting with coloured text in the selection kludge-fix
ListView.st
--- a/ListView.st	Thu Dec 09 23:51:23 1999 +0100
+++ b/ListView.st	Fri Dec 10 13:45:30 1999 +0100
@@ -1372,23 +1372,25 @@
                     ].
                 ].
 
-"/                "/ remove any color emphasis, to enforce drawing in fg/bg
-"/
-"/                (lineString notNil and:[lineString hasChangeOfEmphasis]) ifTrue:[
-"/                    lineString := lineString copyFrom:1 to:eCol.
-"/                    sCol to:eCol do:[:col |
-"/                        |em clr|
-"/
-"/                        em := (lineString emphasis) at:col.
-"/                        em notNil ifTrue:[
-"/                            clr := Text extractEmphasis:#color from:em.
-"/                            clr notNil ifTrue:[
-"/                                em := Text removeEmphasis:(#color->clr) from:em.
-"/                                lineString emphasisAt:col put:em
-"/                            ]
-"/                        ].
-"/                    ].
-"/                ].
+                "/ remove any color emphasis, to enforce drawing in fg/bg
+
+                (lineString notNil 
+                and:[lineString hasChangeOfEmphasis
+                and:[fg ~= fgColor or:[bg ~= bgColor]]]) ifTrue:[
+                    lineString := lineString copyFrom:1 to:eCol.
+                    sCol to:eCol do:[:col |
+                        |em clr|
+
+                        em := (lineString emphasis) at:col.
+                        em notNil ifTrue:[
+                            clr := Text extractEmphasis:#color from:em.
+                            clr notNil ifTrue:[
+                                em := Text removeEmphasis:(#color->clr) from:em.
+                                lineString emphasisAt:col put:em
+                            ]
+                        ].
+                    ].
+                ].
 
                 backgroundAlreadyClearedColor == bg ifFalse:[
                     (lineString isMemberOf:String) ifTrue:[
@@ -3918,5 +3920,5 @@
 !ListView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/ListView.st,v 1.213 1999-08-18 14:42:04 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/ListView.st,v 1.214 1999-12-10 12:45:30 cg Exp $'
 ! !