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

db4
Doug Coleman 2008-11-18 15:58:04 -06:00
commit a3601f8ecc
3 changed files with 11 additions and 9 deletions

14
basis/ui/gadgets/grid-lines/grid-lines.factor Normal file → Executable file
View File

@ -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 ;

0
basis/ui/render/render.factor Normal file → Executable file
View File

6
extra/ui/render/test/test.factor Normal file → Executable file
View File

@ -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 ;