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

fixed hang bug in ui.gadgets.tables

db4
Sam Anklesaria 2009-05-26 14:26:11 -05:00
parent 07ec9de32b
commit e0216e2fe8
2 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
basis/pseudo-slots/pseudo-slots.factor
View File

@ -1,14 +0,0 @@
USING: functors kernel lexer sequences vocabs.parser ;
IN: pseudo-slots
FUNCTOR: make-definitions ( D -- )
D>> DEFINES ${D}>>
>>D DEFINES >>${D}
(>>D) DEFINES (>>${D})
WHERE
GENERIC: (>>D) ( value object -- )
GENERIC: D>> ( object -- value )
: >>D ( object value -- object ) over (>>D) ;
;FUNCTOR
SYNTAX: PSEUDO-SLOTS: ";" parse-tokens [ make-definitions ] each ;

12
basis/ui/gadgets/tables/tables.factor
View File

@ -2,11 +2,11 @@
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: accessors arrays colors colors.constants fry kernel math USING: accessors arrays colors colors.constants fry kernel math
math.functions math.ranges math.rectangles math.order math.vectors math.functions math.ranges math.rectangles math.order math.vectors
models.illusion namespaces opengl pseudo-slots sequences ui.gadgets models.illusion namespaces opengl sequences ui.gadgets
ui.gadgets.scrollers ui.gadgets.status-bar ui.gadgets.worlds ui.gadgets.scrollers ui.gadgets.status-bar ui.gadgets.worlds
ui.gestures ui.render ui.pens.solid ui.text ui.commands ui.images ui.gestures ui.render ui.pens.solid ui.text ui.commands ui.images
ui.gadgets.menus ui.gadgets.line-support math.rectangles models ui.gadgets.menus ui.gadgets.line-support models
math.ranges sequences combinators combinators.short-circuit combinators combinators.short-circuit
fonts locals strings vectors ; fonts locals strings vectors ;
IN: ui.gadgets.tables IN: ui.gadgets.tables
@ -52,7 +52,9 @@ multiple-selection? ;
: in>out ( vector -- val/f ) [ f ] [ peek ] if-empty ; : in>out ( vector -- val/f ) [ f ] [ peek ] if-empty ;
: out>in ( val/f -- vector ) [ 1vector ] [ V{ } clone ] if* ; : out>in ( val/f -- vector ) [ 1vector ] [ V{ } clone ] if* ;
IN: accessors IN: accessors
PSEUDO-SLOTS: selected-value selected-index selected-index* ; SLOT: selected-value
SLOT: selected-index
SLOT: selected-index*
M: table selected-value>> selected-values>> [ in>out ] <illusion> ; M: table selected-value>> selected-values>> [ in>out ] <illusion> ;
M: table (>>selected-value) [ [ out>in ] <illusion> ] dip (>>selected-values) ; M: table (>>selected-value) [ [ out>in ] <illusion> ] dip (>>selected-values) ;
M: table selected-index>> selected-indices>> in>out ; M: table selected-index>> selected-indices>> in>out ;
@ -257,7 +259,7 @@ PRIVATE>
: (selected-rows) ( table -- {row} ) : (selected-rows) ( table -- {row} )
[ selected-indices>> ] keep [ selected-indices>> ] keep
[ nth-row [ 1vector ] [ drop V{ } clone ] if ] curry map concat ; [ nth-row [ 1array ] [ drop { } ] if ] curry map concat >vector ;
: selected-rows ( table -- {value} ) : selected-rows ( table -- {value} )
[ (selected-rows) ] [ renderer>> ] bi [ row-value ] curry map ; [ (selected-rows) ] [ renderer>> ] bi [ row-value ] curry map ;