#REFACTORING by cg
authorClaus Gittinger <cg@exept.de>
Sat, 28 Jan 2017 18:24:44 +0100
changeset 6068 01e28002daf7
parent 6067 964582017d5a
child 6069 2e71d861428b
#REFACTORING by cg class: EditTextView changed: #drawCursor:with:and: draw on gc
EditTextView.st
--- a/EditTextView.st	Sat Jan 28 18:23:09 2017 +0100
+++ b/EditTextView.st	Sat Jan 28 18:24:44 2017 +0100
@@ -2539,15 +2539,15 @@
         super redrawVisibleLine:cursorVisibleLine col:cursorCol.
 
         char := self characterUnderCursor asString.
-        self paint:bgColor.
-        self displayRectangleX:x y:y width:(gc font widthOf:char) height:fontHeight-2.
+        gc paint:bgColor.
+        gc displayRectangleX:x y:y width:(gc font widthOf:char) height:fontHeight-2.
     ] ifFalse:[
         self paint:bgColor.
         cursorType == #ibeam ifTrue:[
             x1 := x - 1.
             y2 := y + fontHeight - lineSpacing - 1.
-            self displayLineFromX:x1 y:y toX:x1 y:y2.
-            self displayLineFromX:x y:y toX:x y:y2.
+            gc displayLineFromX:x1 y:y toX:x1 y:y2.
+            gc displayLineFromX:x y:y toX:x y:y2.
             ^ self
         ].
 
@@ -2555,10 +2555,10 @@
             x1 := x - 1.
             y := y + 1.
             y2 := y + fontHeight - lineSpacing - 1.
-            self displayLineFromX:x1 y:y toX:x1 y:y2.
-            self displayLineFromX:x y:y toX:x y:y2.
-            self displayLineFromX:x1-2 y:y toX:x+2 y:y.
-            self displayLineFromX:x1-2 y:y2 toX:x+2 y:y2.
+            gc displayLineFromX:x1 y:y toX:x1 y:y2.
+            gc displayLineFromX:x y:y toX:x y:y2.
+            gc displayLineFromX:x1-2 y:y toX:x+2 y:y.
+            gc displayLineFromX:x1-2 y:y2 toX:x+2 y:y2.
             ^ self
         ].
 
@@ -2577,20 +2577,20 @@
         self clippingBounds:(margin@margin extent:(width-margin) @ (height-margin)).
 
         cursorType == #caret ifTrue:[
-            self lineWidth:2.
-            self displayLineFromX:x1 y:y2 toX:x y:y.
-            self displayLineFromX:x y:y toX:x2 y:y2.
+            gc lineWidth:2.
+            gc displayLineFromX:x1 y:y2 toX:x y:y.
+            gc displayLineFromX:x y:y toX:x2 y:y2.
         ] ifFalse:[
             "anything else: solidCaret"
 
-            self fillPolygon:(Array with:(x1 @ y2)
-                                    with:(x @ y)
-                                    with:(x2 @ y2))
+            gc fillPolygon:(Array with:(x1 @ y2)
+                                  with:(x @ y)
+                                  with:(x2 @ y2))
         ].
 
         self clippingBounds:oldClip
     ].
-    self paint:oldPaint.
+    gc paint:oldPaint.
 
     "Modified: / 15.12.1999 / 22:24:17 / cg"
 !