From d0e53db5fc9415250170748d01e81fea8c48fb1c Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Tue, 18 Nov 2008 14:15:38 -0600
Subject: [PATCH] Rendering tweaks

---
 basis/opengl/opengl.factor                    | 3 ++-
 basis/ui/gadgets/buttons/buttons.factor       | 4 ++--
 basis/ui/gadgets/editors/editors.factor       | 2 +-
 basis/ui/gadgets/grid-lines/grid-lines.factor | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/basis/opengl/opengl.factor b/basis/opengl/opengl.factor
index 21fe663c44..ecb4c4a08c 100644
--- a/basis/opengl/opengl.factor
+++ b/basis/opengl/opengl.factor
@@ -64,7 +64,8 @@ MACRO: all-enabled-client-state ( seq quot -- )
     [ 2 GL_FLOAT 0 ] dip glTexCoordPointer ; inline
 
 : line-vertices ( a b -- )
-    append >c-float-array gl-vertex-pointer ;
+    [ first2 [ 0.5 + ] bi@ ] bi@ 4 narray
+    >c-float-array gl-vertex-pointer ;
 
 : gl-line ( a b -- )
     line-vertices GL_LINES 0 2 glDrawArrays ;
diff --git a/basis/ui/gadgets/buttons/buttons.factor b/basis/ui/gadgets/buttons/buttons.factor
index 11fb69fc7d..c975e64b12 100644
--- a/basis/ui/gadgets/buttons/buttons.factor
+++ b/basis/ui/gadgets/buttons/buttons.factor
@@ -111,8 +111,8 @@ TUPLE: checkmark-paint < caching-pen color last-vertices ;
 
 : checkmark-points ( dim -- points )
     {
-        [ { 0 0 } v* { 0 1 } v+ ]
-        [ { 1 1 } v* { 0 1 } v+ ]
+        [ { 0 0 } v* ]
+        [ { 1 1 } v* ]
         [ { 0 1 } v* ]
         [ { 1 0 } v* ]
     } cleave 4array ;
diff --git a/basis/ui/gadgets/editors/editors.factor b/basis/ui/gadgets/editors/editors.factor
index 74647a6afb..2cf6d24154 100644
--- a/basis/ui/gadgets/editors/editors.factor
+++ b/basis/ui/gadgets/editors/editors.factor
@@ -112,7 +112,7 @@ M: editor ungraft*
     line-height * ;
 
 : caret-loc ( editor -- loc )
-    [ editor-caret* ] keep 2dup loc>x 1+
+    [ editor-caret* ] keep 2dup loc>x
     rot first rot line>y 2array ;
 
 : caret-dim ( editor -- dim )
diff --git a/basis/ui/gadgets/grid-lines/grid-lines.factor b/basis/ui/gadgets/grid-lines/grid-lines.factor
index d7844e3fa3..adfdd16f69 100644
--- a/basis/ui/gadgets/grid-lines/grid-lines.factor
+++ b/basis/ui/gadgets/grid-lines/grid-lines.factor
@@ -27,7 +27,7 @@ M: grid-lines draw-boundary
         dup grid set
         dup rect-dim half-gap v- grid-dim set
         compute-grid
-        [ { 1 0 } draw-grid-lines ]
+        [ { -0.5 -0.5 } gl-translate { 1 0 } draw-grid-lines ]
         [
             { 0.5 -0.5 } gl-translate
             { 0 1 } draw-grid-lines