Merge branch 'master' of git://factorcode.org/git/factor

basis/ui/gadgets/grid-lines/grid-lines.factor

@@ -18,18 +18,16 @@ SYMBOL: grid-dim
     grid-dim get spin set-axis ;
 
 : draw-grid-lines ( gaps orientation -- )
-    grid get rot grid-positions grid get rect-dim suffix [
-        grid-line-from/to gl-line
-    ] with each ;
+    [ grid get swap grid-positions grid get rect-dim suffix ] dip
+    [ [ v- ] curry map ] keep
+    [ swap grid-line-from/to gl-line ] curry each ;
 
 M: grid-lines draw-boundary
     color>> gl-color [
         dup grid set
         dup rect-dim half-gap v- grid-dim set
         compute-grid
-        [ { -0.5 -0.5 } gl-translate { 1 0 } draw-grid-lines ]
-        [
-            { 0.5 -0.5 } gl-translate
-            { 0 1 } draw-grid-lines
-        ] bi*
+        [ { 1 0 } draw-grid-lines ]
+        [ { 0 1 } draw-grid-lines ]
+        bi*
     ] with-scope ;

extra/ui/render/test/test.factor

@@ -22,8 +22,12 @@ TUPLE: ui-render-test < pack { first-time? initial: t } ;
 : message-window ( text -- )
     <label> "Message" open-window ;
 
+: twiddle ( bytes -- bytes )
+    #! On Windows, white is { 253 253 253 } ?
+    [ dup 253 = [ 2 + ] when ] map ;
+
 : check-rendering ( gadget -- )
-    gl-screenshot
+    gl-screenshot twiddle
     "resource:extra/ui/render/test/reference.bmp" load-bitmap array>>
     = "perfect" "needs work" ? "Your UI rendering is " prepend
     message-window ;