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

Fixing bootstrap after merge

db4
Slava Pestov 2009-02-24 01:32:46 -06:00
parent ce1bc1d6ed
commit 91fff87c0f
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
basis/cocoa/views/views.factor
View File

@ -1,8 +1,8 @@
! Copyright (C) 2006, 2009 Slava Pestov ! Copyright (C) 2006, 2009 Slava Pestov
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: specialized-arrays.int arrays kernel math namespaces make USING: specialized-arrays.int arrays kernel math namespaces make
cocoa cocoa.messages cocoa.classes core-graphics.types sequences cocoa cocoa.messages cocoa.classes core-graphics
continuations accessors ; core-graphics.types sequences continuations accessors ;
IN: cocoa.views IN: cocoa.views
CONSTANT: NSOpenGLPFAAllRenderers 1 CONSTANT: NSOpenGLPFAAllRenderers 1

3
basis/ui/gadgets/frames/frames.factor
View File

@ -22,6 +22,9 @@ M: glue pref-dim* drop { 0 0 } ;
: (fill- ( frame grid-layout quot1 quot2 -- pref-dim gap filled-cell dims ) : (fill- ( frame grid-layout quot1 quot2 -- pref-dim gap filled-cell dims )
[ '[ [ dim>> ] [ gap>> ] [ filled-cell>> ] tri _ tri@ ] dip ] dip call ; inline [ '[ [ dim>> ] [ gap>> ] [ filled-cell>> ] tri _ tri@ ] dip ] dip call ; inline
: available-space ( pref-dim gap dims -- avail )
length 1+ * [-] ; inline
: -center) ( pref-dim gap filled-cell dims -- ) : -center) ( pref-dim gap filled-cell dims -- )
[ nip available-space ] 2keep [ remove-nth sum [-] ] 2keep set-nth ; inline [ nip available-space ] 2keep [ remove-nth sum [-] ] 2keep set-nth ; inline