steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix bootstrap

cvs
Slava Pestov 2005-10-26 04:27:38 +00:00
parent e4d98b677f
commit 8fe589c308
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
library/ui/paint.factor
View File

@ -5,6 +5,16 @@ io kernel lists math namespaces opengl sdl sequences strings
styles vectors ; styles vectors ;
IN: gadgets IN: gadgets
: paint-prop* ( gadget key -- value ) swap gadget-paint ?hash ;
: paint-prop ( gadget key -- value )
over [
2dup paint-prop* dup
[ 2nip ] [ drop >r gadget-parent r> paint-prop ] if
] [
2drop f
] if ;
GENERIC: draw-gadget* ( gadget -- ) GENERIC: draw-gadget* ( gadget -- )
M: gadget draw-gadget* ( gadget -- ) drop ; M: gadget draw-gadget* ( gadget -- ) drop ;
@ -44,16 +54,6 @@ DEFER: draw-gadget
] with-scope ] with-scope
] when drop ; ] when drop ;
: paint-prop* ( gadget key -- value ) swap gadget-paint ?hash ;
: paint-prop ( gadget key -- value )
over [
2dup paint-prop* dup
[ 2nip ] [ drop >r gadget-parent r> paint-prop ] if
] [
2drop f
] if ;
: init-paint ( gadget -- gestures ) : init-paint ( gadget -- gestures )
dup gadget-paint dup gadget-paint
[ ] [ {{ }} clone dup rot set-gadget-paint ] ?if ; [ ] [ {{ }} clone dup rot set-gadget-paint ] ?if ;

5
library/ui/theme.factor
View File

@ -2,7 +2,6 @@
! See http://factor.sf.net/license.txt for BSD license. ! See http://factor.sf.net/license.txt for BSD license.
IN: gadgets-buttons IN: gadgets-buttons
DEFER: <button-paint> DEFER: <button-paint>
DEFER: button-paint
IN: gadgets-theme IN: gadgets-theme
USING: arrays gadgets kernel sequences styles ; USING: arrays gadgets kernel sequences styles ;
@ -48,8 +47,8 @@ USING: arrays gadgets kernel sequences styles ;
bold font-style set-paint-prop ; bold font-style set-paint-prop ;
: roll-button-theme ( button -- ) : roll-button-theme ( button -- )
dup << button-paint f f << solid >> << solid >> >> boundary set-paint-prop dup f f << solid >> << solid >> <button-paint> boundary set-paint-prop
dup << button-paint f f f << solid >> >> interior set-paint-prop dup f f f << solid >> <button-paint> interior set-paint-prop
@{ 236 230 232 }@ background set-paint-prop ; @{ 236 230 232 }@ background set-paint-prop ;
: caret-theme ( caret -- ) : caret-theme ( caret -- )