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

table views: selected value is always a vector

db4
Sam Anklesaria 2009-05-13 17:17:10 -05:00
parent 89efe27ab5
commit 1a8fcee712
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,9 +55,9 @@ GENERIC: (>>selected-value) ( val table -- )
: >>selected-index ( table n -- table ) over (>>selected-index) ; : >>selected-index ( table n -- table ) over (>>selected-index) ;
: >>selected-value ( table val -- table ) over (>>selected-value) ; : >>selected-value ( table val -- table ) over (>>selected-value) ;
M: table selected-value>> selected-values>> [ [ peek ] [ f ] if* ] <arrow> ; M: table selected-value>> selected-values>> [ [ f ] [ peek ] if-empty ] <arrow> ;
M: table (>>selected-value) [ [ 1vector ] <arrow> ] dip (>>selected-values) ; M: table (>>selected-value) [ [ 1vector ] <arrow> ] dip (>>selected-values) ;
M: table selected-index>> selected-indices>> [ peek ] [ f ] if* ; M: table selected-index>> selected-indices>> [ f ] [ peek ] if-empty ;
M: table (>>selected-index) [ 1vector ] dip (>>selected-indices) ; M: table (>>selected-index) [ 1vector ] dip (>>selected-indices) ;
IN: ui.gadgets.tables IN: ui.gadgets.tables
@ -67,7 +67,7 @@ IN: ui.gadgets.tables
new-line-gadget new-line-gadget
swap >>renderer swap >>renderer
swap >>model swap >>model
f <model> >>selected-values V{ } clone <model> >>selected-values
sans-serif-font >>font sans-serif-font >>font
focus-border-color >>focus-border-color focus-border-color >>focus-border-color
transparent >>column-line-color ; inline transparent >>column-line-color ; inline
@ -150,7 +150,7 @@ M: table layout*
: draw-selected-rows ( table -- ) : draw-selected-rows ( table -- )
{ {
{ [ dup selected-indices>> not ] [ drop ] } { [ dup selected-indices>> empty? ] [ drop ] }
[ [
[ selected-indices>> ] [ selection-color>> gl-color ] [ ] tri [ selected-indices>> ] [ selection-color>> gl-color ] [ ] tri
[ swap row-bounds gl-fill-rect ] curry each [ swap row-bounds gl-fill-rect ] curry each
@ -279,11 +279,11 @@ PRIVATE>
: find-row-index ( value table -- n/f ) : find-row-index ( value table -- n/f )
[ model>> value>> ] [ renderer>> '[ _ row-value ] map index ] bi ; [ model>> value>> ] [ renderer>> '[ _ row-value ] map index ] bi ;
: initial-selected-indices ( table -- n/f ) : initial-selected-indices ( table -- {n}/f )
{ {
[ model>> value>> empty? not ] [ model>> value>> empty? not ]
[ selection-required?>> ] [ selection-required?>> ]
[ drop V{ 0 } ] [ drop V{ 0 } clone ]
} 1&& ; } 1&& ;
: (update-selected-indices) ( table -- {n}/f ) : (update-selected-indices) ( table -- {n}/f )
@ -297,9 +297,9 @@ PRIVATE>
} 1|| ; } 1|| ;
M: table model-changed M: table model-changed
nip dup update-selected-indices { nip dup update-selected-indices [ V{ } clone ] unless* {
[ >>selected-indices f >>mouse-index drop ] [ >>selected-indices f >>mouse-index drop ]
[ peek show-row-summary ] [ [ f ] [ peek ] if-empty show-row-summary ]
[ drop update-selected-values ] [ drop update-selected-values ]
[ drop relayout ] [ drop relayout ]
} 2cleave ; } 2cleave ;