draw closed frames around selections if highlightMode ~~ #line
authortz
Tue, 01 Sep 1998 15:38:18 +0200
changeset 1105 c79bb5824b74
parent 1104 a7101d656dab
child 1106 57c41df67ae5
draw closed frames around selections if highlightMode ~~ #line
SelTreeV.st
SelectionInTreeView.st
--- a/SelTreeV.st	Tue Sep 01 14:26:01 1998 +0200
+++ b/SelTreeV.st	Tue Sep 01 15:38:18 1998 +0200
@@ -1042,18 +1042,25 @@
     hilightFrameColor notNil ifTrue:[
         hilightLevel == 0 ifTrue:[
             self paint:hilightFrameColor.
-            self displayLineFromX:x0 y:y0 toX:x1 y:y0.
-            y := y0 + fontHeight - 1.
-          ^ self displayLineFromX:x0 y:y toX:x1 y:y.
+            highlightMode == #line ifTrue:[
+                self displayLineFromX:x0 y:y0 toX:x1 y:y0.
+                y := y0 + fontHeight - 1.
+                ^self displayLineFromX:x0 y:y toX:x1 y:y.
+            ] ifFalse:[
+                ^self displayRectangleX:x0 y:y0 width:x1 - x0 height:fontHeight
+            ]
         ]
     ] ifFalse:[
         hilightStyle == #motif ifTrue:[
             self paint:bgColor.
-
             y := y0 + 1.
-            self displayLineFromX:x0 y:y toX:x1 y:y.
-            y := y0 + fontHeight - 2.
-            self displayLineFromX:x0 y:y toX:x1 y:y.
+            highlightMode == #line ifTrue:[
+                self displayLineFromX:x0 y:y toX:x1 y:y.
+                y := y0 + fontHeight - 2.
+                self displayLineFromX:x0 y:y toX:x1 y:y.
+            ] ifFalse:[
+                self displayRectangleX:x0 + 1 y:y width:x1 - x0 - 2 height:fontHeight - 2
+            ]
         ]
     ].
 
@@ -2127,5 +2134,5 @@
 !SelectionInTreeView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg2/Attic/SelTreeV.st,v 1.66 1998-08-24 14:18:24 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg2/Attic/SelTreeV.st,v 1.67 1998-09-01 13:38:18 tz Exp $'
 ! !
--- a/SelectionInTreeView.st	Tue Sep 01 14:26:01 1998 +0200
+++ b/SelectionInTreeView.st	Tue Sep 01 15:38:18 1998 +0200
@@ -1042,18 +1042,25 @@
     hilightFrameColor notNil ifTrue:[
         hilightLevel == 0 ifTrue:[
             self paint:hilightFrameColor.
-            self displayLineFromX:x0 y:y0 toX:x1 y:y0.
-            y := y0 + fontHeight - 1.
-          ^ self displayLineFromX:x0 y:y toX:x1 y:y.
+            highlightMode == #line ifTrue:[
+                self displayLineFromX:x0 y:y0 toX:x1 y:y0.
+                y := y0 + fontHeight - 1.
+                ^self displayLineFromX:x0 y:y toX:x1 y:y.
+            ] ifFalse:[
+                ^self displayRectangleX:x0 y:y0 width:x1 - x0 height:fontHeight
+            ]
         ]
     ] ifFalse:[
         hilightStyle == #motif ifTrue:[
             self paint:bgColor.
-
             y := y0 + 1.
-            self displayLineFromX:x0 y:y toX:x1 y:y.
-            y := y0 + fontHeight - 2.
-            self displayLineFromX:x0 y:y toX:x1 y:y.
+            highlightMode == #line ifTrue:[
+                self displayLineFromX:x0 y:y toX:x1 y:y.
+                y := y0 + fontHeight - 2.
+                self displayLineFromX:x0 y:y toX:x1 y:y.
+            ] ifFalse:[
+                self displayRectangleX:x0 + 1 y:y width:x1 - x0 - 2 height:fontHeight - 2
+            ]
         ]
     ].
 
@@ -2127,5 +2134,5 @@
 !SelectionInTreeView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg2/SelectionInTreeView.st,v 1.66 1998-08-24 14:18:24 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg2/SelectionInTreeView.st,v 1.67 1998-09-01 13:38:18 tz Exp $'
 ! !