From db42113bb9d8a3fb71e3640c2f9c854b2e1ac5ef Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Tue, 18 Nov 2008 20:35:50 -0600
Subject: [PATCH] Fix ui.render.test

---
 extra/ui/render/test/reference.bmp | Bin 73554 -> 73654 bytes
 extra/ui/render/test/test.factor   |  36 ++++++++++++++++-------------
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/extra/ui/render/test/reference.bmp b/extra/ui/render/test/reference.bmp
index 0740fcc8173f0a6fc4fcfa76802b5146e5a7c59b..3ba20c404340ea581d6be7d0dd0c81ef97940cec 100644
GIT binary patch
literal 73654
zcmeI%L6X`q5QSmq7Fnb!+ngW=$Ue8orMO6Lmi0uoQA-gRx7>of!oLf!kR{VReRfeZ
zKYsrH`e~ZC@9Ft1J^!TVuk`#heNL~_^yPYdd2@aFU~?xhO&>g*3AjUj?!YOXzUEGQ
zD}g1b=Pt(EoIPCwA{)N9Jh%O6!E}~QM9)?kIzi#Pb-eYy_I+X7NMIF@?=3~T{f+Of
zTi2QUlX-mW3VvJ}zIQKOd_N{6eH7pLmIfLu4&V3=5|W;dZ+uGw4Hk!Qd<O|hPscaD
zrGW;E!#BQzgrukA8{g7EgT>(+-$6ps)A5aOX`sR4@Qv>vA?fM(#<w)kU~%}ycaV_u
zbbRAm8fdUMeB(PvNP0TH@huHBSRB6b9V8?@9pCtt1{y35-}nv^lAexld`klj7Kd+q
z2MI|}$2Y#Efd-4iH@<^}q^IK>-_k&X#o-&@K|<2g@r`e3puytsjqe~K>FM~!w=~dT
zarnk}kdX9reB)ahXs|eZ<2y)5dOE)GEe$kS9KP`#BqTi@-}sgW8Y~Xq_zn`1o{n#P
zO9KrShi`lb2}w`KH@>BT28+WtzJr9Mr{f#n(m;d7;TzvULekUmjc;k7!Q$|Z?;s)R
z>G;OCG|*si_{MjTko0tX<69bNusD3<J4i@+I=+wio~DmukKGUR4Vac?lZGWy+!E9^
z)XU}Ki}zfkES5z2x|LR}C(rKP<J)`rq-1TeY$1E&e(&)Xiv?98vu|FG<t|T89^1Re
zH@<t#Y>t26yBN-`yf3$n+n&u&av#7qzTH^%2IAX`NpM_RT)V;8Lhh~jxsF>b7L-MH
ztS25H_iyi|gzsH#`1WEF9EWdw3$h$m629?043prA@QrUlmcvTIH@=5q5<C&U@h!-5
zSV{QC_b^O?C&G8ccbQxM5}x}!J$Y>Jp1*&4FQt^MErk7{w>R$h9&fQ&P$e?^=H*!K
z^7Q1fy?cD)yVuO-`1`&S-vf`$59vFAZ+!QOc`*9E?`DGMZhbqZIf?r%zVYqGvNsUl
zUQB}H(&E}}#TIgJ#m{xzVzHnsvSU5*__%+2FC~2MYQwh|li)af<6DsBu#)hN?_rn(
zPlRuL3$h$m629?043prA@QrUlmcvTIH@=5q5<C&U@h!-5SV{QC_b^O?C&G8ccbQxM
zlbQQGJ$Y>Jp8sEZFQt^MErk7}t~c)Y9&fQ&P$e?^=H*!K^7Q1fy?cD)yVuO-`1`&S
z-vf`E5Am+kzgG*sy}6~pEjnAsn^ib<hs9z+mB=iZax8awdgk!wEzh~Xza4|`HIx0<
zl&HmP3wb~0v-Vmn7F3DMGAYM$m#1g(ohCdWz8-1@;Co;8I${a;x+J!cd5PH130N#e
zY;NU!xk-3>>R1h~H9SZ0jqln?sQnt>sl<kO{kCq;BiGU1MLzMkC8+c=Z?=%@TVB@$
zEEdnb*)ygNwuPJLZ}qQp@$J22Q(iezeAn<w`<1?z<(Sv5eEiaCdhm_!M#%BE`1WEF
z9G8~eZWgwX$1S|$OpC>WvdE70)FHJu=6uGj{&g<*Z||j)^2(9&`=o|f+As6{z;t_P
zSvKz)pLra<3*?Q~YkW6?*IKO88rS}`JF{B<cVB{9L*xE^&7s-7z<0y9E?_;>4B+>P
zS9pq&-zT-F+xD}4H+F9eSl6=d$2Y!f525x0-{rh^ldvvNPtUImJ8^2@`=IZ%mTb2P
zthS2S(#q<N_2k*Tdwd`9-J9~+#uvk>b?h-HGJNBE5T)ug#dp>DUz)RTHfI9I?nLLD
K<&5;%!=}F=HK2U}

literal 73554
zcmeIwu?Ye}7=+RPx-bw-t-u1zO{~HGGvjlWD?&cr!Y&*a&CI($o|kRD=eF*3-S@h$
zb+<XKcjkQj|9u?K?r5Ofz;vTYrh%Pr2+9rcU0zo<z8NStz;}6F+4yFl+yLL@b!Fq5
zfpP<Um)DhzZwAT@@LgV4Hoh4sH^6s!UD^0%pxgl8<#lD_n}Koze3#dijc*3Z4e(uF
zS2n&GC^x`&d0pA~W}w^v-{o~><C}qU1ALd)m5px($_?;cURO5087McvcX?ge_-3Ho
z0N>?xW#gNHaszyq*OiTL2FeZaU0zo<z8NStz;}6F+4yFl+yLL@b!Fq5fpP<Um)Dhz
zZwAT@@LgV4Hoh4sH^6s!UD^0%pxgl8<#lD_n}Koze3#dijc*3Z4e(uFS2n&GC^x`&
zd0pA~W}w^v-{o~><C}qU1ALd)m5px($_?;cURO5087McvcX?ge_-3Ho0N>?xW#gNH
zaszyq*OiTL2FeZaU0zo<z8NStz;}6F+4yFl+yLL@b!Fq5fpP<Um)DhzZwAT@@LgV4
zHoh4sH^6s!UD^0%pxgl8<#lD_n}Koze3#dijc*3Z4e(uFS2n&GC^x`&d0pA~W}w^v
z-{o~><C}qU1ALd)m5px($_?;cURO5087McvcX?ge_-3Ho0N>?xW#gNHaszyq*OiTL
O2FeZaU0(OkvwZ-#zpe-X

diff --git a/extra/ui/render/test/test.factor b/extra/ui/render/test/test.factor
index bf7b7b4556..484d255b72 100755
--- a/extra/ui/render/test/test.factor
+++ b/extra/ui/render/test/test.factor
@@ -17,8 +17,6 @@ M: line-test draw-interior
         line-test >>interior
         { 1 10 } >>dim ;
 
-TUPLE: ui-render-test < pack { first-time? initial: t } ;
-
 : message-window ( text -- )
     <label> "Message" open-window ;
 
@@ -26,24 +24,30 @@ TUPLE: ui-render-test < pack { first-time? initial: t } ;
     #! On Windows, white is { 253 253 253 } ?
     [ dup 253 = [ 2 + ] when ] map ;
 
-: check-rendering ( gadget -- )
-    gl-screenshot twiddle
-    "resource:extra/ui/render/test/reference.bmp" load-bitmap array>>
-    = "perfect" "needs work" ? "Your UI rendering is " prepend
-    message-window ;
+SYMBOL: render-output
 
-M: ui-render-test draw-gadget*
-    [ call-next-method ] [
-        dup first-time?>> [
-            dup check-rendering
-            f >>first-time?
-        ] when
-        drop
+: check-rendering ( gadget -- )
+    screenshot [ twiddle ] change-array
+    [ render-output set-global ]
+    [
+        "resource:extra/ui/render/test/reference.bmp" load-bitmap
+        [ array>> ] bi@ = "perfect" "needs work" ?
+        "Your UI rendering is " prepend
+        message-window
     ] bi ;
 
+TUPLE: take-screenshot { first-time? initial: t } ;
+
+M: take-screenshot draw-boundary
+    dup first-time?>> [
+        over check-rendering
+        f >>first-time?
+    ] when
+    2drop ;
+
 : <ui-render-test> ( -- gadget )
-    \ ui-render-test new-gadget
-        { 1 0 } >>orientation
+    <shelf>
+        take-screenshot new >>boundary
         <gadget>
             black <solid> >>interior
             { 98 98 } >>dim