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

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

db4
John Benediktsson 2008-11-08 16:37:38 -08:00
parent 48bca83981 98487c630e
commit 6484dd2b44
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
basis/ui/gadgets/lists/lists.factor
View File

@ -97,7 +97,7 @@ M: list focusable-child* drop t ;
] if ; ] if ;
: select-gadget ( gadget list -- ) : select-gadget ( gadget list -- )
swap over children>> index tuck children>> index
[ swap select-index ] [ drop ] if* ; [ swap select-index ] [ drop ] if* ;
: clamp-loc ( point max -- point ) : clamp-loc ( point max -- point )

2
basis/ui/gadgets/scrollers/scrollers.factor
View File

@ -41,7 +41,7 @@ scroller H{
dup model>> dependencies>> first <x-slider> >>x dup x>> @bottom grid-add dup model>> dependencies>> first <x-slider> >>x dup x>> @bottom grid-add
dup model>> dependencies>> second <y-slider> >>y dup y>> @right grid-add dup model>> dependencies>> second <y-slider> >>y dup y>> @right grid-add
swap over model>> <viewport> >>viewport tuck model>> <viewport> >>viewport
dup viewport>> @center grid-add ; dup viewport>> @center grid-add ;
: <scroller> ( gadget -- scroller ) scroller new-scroller ; : <scroller> ( gadget -- scroller ) scroller new-scroller ;

11
extra/mason/release/tidy/tidy.factor
View File

@ -1,16 +1,14 @@
! Copyright (C) 2008 Eduardo Cavazos, Slava Pestov. ! Copyright (C) 2008 Eduardo Cavazos, Slava Pestov.
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: kernel namespaces continuations debugger sequences fry USING: kernel namespaces continuations debugger sequences fry
io.files io.launcher mason.common mason.platform io.files io.launcher bootstrap.image qualified mason.common
mason.config ; mason.config ;
FROM: mason.config => target-os ;
IN: mason.release.tidy IN: mason.release.tidy
: common-files ( -- seq ) : common-files ( -- seq )
images [ boot-image-name ] map
{ {
"boot.x86.32.image"
"boot.x86.64.image"
"boot.macosx-ppc.image"
"boot.linux-ppc.image"
"vm" "vm"
"temp" "temp"
"logs" "logs"
@ -20,7 +18,8 @@ IN: mason.release.tidy
"unmaintained" "unmaintained"
"unfinished" "unfinished"
"build-support" "build-support"
} ; }
append ;
: remove-common-files ( -- ) : remove-common-files ( -- )
common-files [ delete-tree ] each ; common-files [ delete-tree ] each ;