--- a/GraphicsContext.st Tue Feb 05 20:26:13 2008 +0100
+++ b/GraphicsContext.st Tue Feb 05 20:58:43 2008 +0100
@@ -1732,20 +1732,20 @@
self displayLineFromX:left y:(top + hHalf - 1) toX:left y:(bottom - hHalf).
"top right arc"
- self displayArcX:(right - wC + 1) y:top width:wC height:hC from:0 angle:90.
+ self displayArcX:(right - wC) y:top width:wC height:hC from:0 angle:90.
"bottom line"
- self displayLineFromX:(left + wHalf -1) y:bottom+1
- toX:(right - wHalf + 1 ) y:bottom+1.
+ self displayLineFromX:(left + wHalf -1) y:bottom
+ toX:(right - wHalf ) y:bottom.
"bottom right arc"
- self displayArcX:(right - wC + 1) y:(bottom - hC + 1) width:wC height:hC from:270 angle:90.
+ self displayArcX:(right - wC) y:(bottom - hC) width:wC height:hC from:270 angle:90.
"right line"
- self displayLineFromX:right+1 y:(top + hHalf) toX:right+1 y:(bottom - hHalf).
+ self displayLineFromX:right y:(top + hHalf) toX:right y:(bottom - hHalf).
"bottom left arc"
- self displayArcX:left y:(bottom - hC + 1) width:wC height:hC from:180 angle:90
+ self displayArcX:left y:(bottom - hC) width:wC height:hC from:180 angle:90
"
|v|
@@ -2340,11 +2340,18 @@
"top left arc"
self fillArcX:left y:top width:wC height:hC from:90 angle:90.
"top right arc"
- self fillArcX:(right - wC) y:top width:wC height:hC from:0 angle:90.
+ self fillArcX:(right - wC - 1) y:top width:wC height:hC from:0 angle:90.
"bottom right arc"
- self fillArcX:(right - wC) y:(bottom - hC) width:wC height:hC from:270 angle:90.
+ self fillArcX:(right - wC - 1) y:(bottom - hC - 1) width:wC height:hC from:270 angle:90.
"bottom left arc"
- self fillArcX:left y:(bottom - hC) width:wC height:hC from:180 angle:90.
+ self fillArcX:left y:(bottom - hC) width:wC height:hC-1 from:180 angle:90.
+
+ "center rectangle"
+ self fillRectangleX:(left + wHalf) y:top width:(width - wHalf - wHalf) height:height-1.
+ "left partial rectangle"
+ self fillRectangleX:left y:top+hHalf width:wHalf height:(height-hHalf-hHalf).
+ "right partial rectangle"
+ self fillRectangleX:right-wHalf y:top+hHalf width:wHalf-1 height:(height-hHalf-hHalf).
] ifFalse:[
"top left arc"
self fillArcX:left y:top width:wC height:hC from:90 angle:90.
@@ -2355,14 +2362,14 @@
"bottom left arc"
self fillArcX:left y:(bottom - hC + 1) width:wC height:hC from:180 angle:90.
+ "center rectangle"
+ self fillRectangleX:(left + wHalf) y:top width:(width - wHalf - wHalf+1) height:height.
+ "left partial rectangle"
+ self fillRectangleX:left y:top+hHalf width:wHalf height:(height-hHalf-hHalf).
+ "right partial rectangle"
+ self fillRectangleX:right-wHalf y:top+hHalf width:wHalf height:(height-hHalf-hHalf).
].
- "center rectangle"
- self fillRectangleX:(left + wHalf) y:top width:(width - wHalf - wHalf+1) height:height.
- "left partial rectangle"
- self fillRectangleX:left y:top+hHalf width:wHalf height:(height-hHalf-hHalf).
- "right partial rectangle"
- self fillRectangleX:right-wHalf y:top+hHalf width:wHalf height:(height-hHalf-hHalf).
"
|v|
@@ -2413,7 +2420,7 @@
!GraphicsContext class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview/GraphicsContext.st,v 1.114 2008-02-05 19:26:13 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/GraphicsContext.st,v 1.115 2008-02-05 19:58:43 cg Exp $'
! !
GraphicsContext initialize!