Fix caret rendering on X11, invoke-presentation stack effect

[factor.git] / library / ui / text / editor.factor

diff --git a/library/ui/text/editor.factor b/library/ui/text/editor.factor
index a7bbcd1609f268cc50b5e62da87e8d75ac7e3529..ccba9944130679845cc64373b4fc559c7b20f354 100644 (file)
--- a/library/ui/text/editor.factor
+++ b/library/ui/text/editor.factor
@@ -112,14 +112,12 @@ M: editor model-changed
     rot first rot line>y 2array ;
 
 : caret-dim ( editor -- dim )
-    line-height 1 swap 2array ;
-
-: caret-rect ( editor -- dim )
-    dup caret-loc swap caret-dim <rect> ;
+    line-height 0 swap 2array ;
 
 : scroll>caret ( editor -- )
     dup gadget-grafted? [
-        dup caret-rect over scroll>rect
+        dup caret-loc over caret-dim { 1 0 } v+ <rect>
+        over scroll>rect
     ] when drop ;
 
 M: loc-monitor model-changed
@@ -130,7 +128,7 @@ M: loc-monitor model-changed
     editor get editor-focused? [
         editor get
         dup editor-caret-color gl-color
-        caret-rect rect-extent gl-line
+        dup caret-loc swap caret-dim over v+ gl-line
     ] when ;
 
 : translate-lines ( n -- )