--- a/MenuView.st Thu May 30 09:17:48 1996 +0200
+++ b/MenuView.st Thu May 30 09:20:25 1996 +0200
@@ -1431,7 +1431,7 @@
|listLine
y "{ Class: SmallInteger }"
y2 "{ Class: SmallInteger }"
- r2 radius topLeftColor botRightColor |
+ r2 rI lI radius topLeftColor botRightColor |
hilightStyle ~~ #openwin ifTrue:[
@@ -1448,8 +1448,11 @@
y := (self yOfVisibleLine:visLineNr) - (lineSpacing//2).
y2 := y + fontHeight - 1.
- r2 := font height.
+ r2 := fontHeight.
radius := r2 // 2.
+ rI := 0. "/ 2.
+ lI := 1. "/ 2.
+
"
refill with normal bg, where arcs will be drawn below
"
@@ -1460,8 +1463,8 @@
fill the arcs
"
self paint:hilightBgColor.
- self fillArcX:1+margin+1 y:y width:r2 height:r2+1+1 from:90 angle:180.
- self fillArcX:width-r2-1-1-margin-1 y:y width:r2 height:r2+1+1 from:270 angle:180.
+ self fillArcX:margin+lI y:y width:r2 height:r2+rI from:90 angle:180.
+ self fillArcX:width-r2-rI-margin-1 y:y width:r2 height:r2+rI from:270 angle:180.
"
a highlight-border around
@@ -1471,8 +1474,8 @@
self displayLineFromX:radius+2 y:y toX:width-radius-3 y:y.
self displayLineFromX:radius+2 y:y2 toX:width-radius-3 y:y2.
- self displayArcX:1+margin+1 y:y width:r2 height:r2+1+1 from:90 angle:180.
- self displayArcX:width-r2-1-1-margin-1 y:y width:r2 height:r2+1+1 from:270 angle:180.
+ self displayArcX:margin+lI y:y width:r2 height:r2+rI from:90 angle:180.
+ self displayArcX:width-r2-rI-margin-1 y:y width:r2 height:r2+rI from:270 angle:180.
^ self
].
@@ -1491,21 +1494,21 @@
self paint:topLeftColor.
self displayLineFromX:radius+2 y:y toX:width-radius-3 y:y.
- self displayArcX:1+margin+1 y:y width:r2 height:r2+1+1 from:90 angle:125.
- self displayArcX:width-r2-1-1-margin-1 y:y width:r2 height:r2+1+1 from:270+125 angle:55.
+ self displayArcX:margin+lI y:y width:r2 height:r2+rI from:90 angle:125.
+ self displayArcX:width-r2-rI-margin-1 y:y width:r2 height:r2+rI from:270+125 angle:55.
self paint:botRightColor.
self displayLineFromX:radius+2 y:y2 toX:width-radius-3 y:y2.
- self displayArcX:1+margin+1 y:y width:r2 height:r2+1+1 from:90+125 angle:55.
- self displayArcX:width-r2-1-1-margin-1 y:y width:r2 height:r2+1+1 from:270 angle:125.
+ self displayArcX:margin+lI y:y width:r2 height:r2+rI from:90+125 angle:55.
+ self displayArcX:width-r2-rI-margin-1 y:y width:r2 height:r2+rI from:270 angle:125.
].
^ self
].
^ super drawVisibleLine:visLineNr with:fg and:bg
"Created: 28.2.1996 / 18:41:17 / cg"
- "Modified: 8.5.1996 / 08:43:29 / cg"
+ "Modified: 30.5.1996 / 09:19:49 / cg"
! !
!MenuView methodsFor:'event handling'!
@@ -1799,7 +1802,7 @@
"stupid - have to redo this ..."
hilightStyle == #openwin ifTrue:[
"add some space for rounded-hilight area"
- self leftMargin:(font height // 2 + 2 "inset of rounded rect") "10".
+ self leftMargin:(font height " // 2" + 2 "inset of rounded rect") "10".
] ifFalse:[
(hilightLevel ~~ 0) ifTrue:[
self leftMargin:hilightLevel abs + self margin abs + 1.
@@ -1807,7 +1810,7 @@
]
].
- "Modified: 28.2.1996 / 19:39:28 / cg"
+ "Modified: 30.5.1996 / 09:19:46 / cg"
!
recreate
@@ -2515,5 +2518,5 @@
!MenuView class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg/MenuView.st,v 1.84 1996-05-29 10:22:44 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg/MenuView.st,v 1.85 1996-05-30 07:20:25 cg Exp $'
! !