From dba67b18156f24a3df31feaeaec5c33b7a1291ba Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Wed, 5 Aug 2009 22:45:56 -0500 Subject: [PATCH] ui.gadgets.tables: little cleanup --- basis/ui/gadgets/tables/tables.factor | 95 +++++++++++++++++---------- 1 file changed, 59 insertions(+), 36 deletions(-) diff --git a/basis/ui/gadgets/tables/tables.factor b/basis/ui/gadgets/tables/tables.factor index bb70173455..eba646d08a 100644 --- a/basis/ui/gadgets/tables/tables.factor +++ b/basis/ui/gadgets/tables/tables.factor @@ -1,13 +1,12 @@ ! Copyright (C) 2008, 2009 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -USING: accessors arrays colors colors.constants fry kernel math -math.functions math.ranges math.rectangles math.order math.vectors -models.illusion namespaces opengl sequences ui.gadgets +USING: accessors assocs hashtables arrays colors colors.constants fry +kernel math math.functions math.ranges math.rectangles math.order +math.vectors namespaces opengl sequences ui.gadgets ui.gadgets.scrollers ui.gadgets.status-bar ui.gadgets.worlds ui.gestures ui.render ui.pens.solid ui.text ui.commands ui.images -ui.gadgets.menus ui.gadgets.line-support models -combinators combinators.short-circuit -fonts locals strings sequences.extras sets ; +ui.gadgets.menus ui.gadgets.line-support models combinators +combinators.short-circuit fonts locals strings sets sorting ; IN: ui.gadgets.tables ! Row rendererer protocol @@ -52,15 +51,23 @@ multiple-selection? ; array ] change-selected-indices ; -: multiple>single ( values -- value/f ? ) [ f f ] [ first t ] if-empty ; -: multiple>single* ( values -- value/f ) multiple>single drop ; -: selected-index ( table -- n ) selected-indices>> multiple>single* ; -: set-selected-index ( table n -- table ) 1array >>selected-indices ; +: add-selected-index ( table n -- table ) + over selected-indices>> conjoin ; + +: multiple>single ( values -- value/f ? ) + dup assoc-empty? [ drop f f ] [ keys first t ] if ; + +: selected-index ( table -- n ) + selected-indices>> multiple>single drop ; + +: set-selected-index ( table n -- table ) + dup associate >>selected-indices ; + PRIVATE> -: selected ( table -- index/indices ) dup multiple-selection?>> - [ selected-indices>> ] [ selected-index ] if ; + +: selected ( table -- index/indices ) + [ selected-indices>> ] [ multiple-selection?>> ] bi + [ multiple>single drop ] unless ; : new-table ( rows renderer class -- table ) new-line-gadget @@ -70,7 +77,8 @@ PRIVATE> focus-border-color >>focus-border-color transparent >>column-line-color f >>selection-index - f >>selection ; + f >>selection + H{ } clone >>selected-indices ; : ( rows renderer -- table ) table new-table ; @@ -150,9 +158,9 @@ M: table layout* : draw-selected-rows ( table -- ) { - { [ dup selected-indices>> empty? ] [ drop ] } + { [ dup selected-indices>> assoc-empty? ] [ drop ] } [ - [ selected-indices>> ] [ selection-color>> gl-color ] [ ] tri + [ selected-indices>> keys ] [ selection-color>> gl-color ] [ ] tri [ swap row-bounds gl-fill-rect ] curry each ] } cond ; @@ -209,7 +217,8 @@ M: table layout* :: row-font ( row ind table -- font ) table font>> clone row table renderer>> row-color [ >>foreground ] when* - ind table selected-indices>> index [ table selection-color>> >>background ] when ; + ind table selected-indices>> key? + [ table selection-color>> >>background ] when ; : draw-columns ( columns widths alignment font gap -- ) '[ [ _ ] 3dip _ draw-column ] 3each ; @@ -254,23 +263,32 @@ M: table pref-dim* PRIVATE> : (selected-rows) ( table -- {row} ) - [ selected-indices>> ] keep - [ nth-row [ 1array ] [ drop { } ] if ] curry map concat ; + [ selected-indices>> keys natural-sort ] keep + '[ _ nth-row [ 1array ] [ drop { } ] if ] map concat ; : selected-rows ( table -- {value} ) - [ (selected-rows) ] [ renderer>> ] bi [ row-value ] curry map ; + [ (selected-rows) ] [ renderer>> ] bi '[ _ row-value ] map ; + : (selected-row) ( table -- value/f ? ) (selected-rows) multiple>single ; + : selected-row ( table -- value/f ? ) selected-rows multiple>single ; single* ] unless swap set-model ; + [ multiple>single drop ] unless swap set-model ; : update-selected ( table -- ) - [ [ selection>> ] [ selected-rows ] [ multiple-selection?>> ] tri set-table-model ] [ - [ selection-index>> ] [ selected-indices>> ] [ multiple-selection?>> ] tri + [ selection>> ] + [ selected-rows ] + [ multiple-selection?>> ] tri + set-table-model + ] + [ + [ selection-index>> ] + [ selected-indices>> ] + [ multiple-selection?>> ] tri set-table-model ] bi ; @@ -286,17 +304,17 @@ PRIVATE> : find-row-index ( value table -- n/f ) [ model>> value>> ] [ renderer>> '[ _ row-value ] map index ] bi ; -: initial-selected-indices ( table -- {n}/f ) +: (update-selected-indices) ( table -- set ) + [ selection>> value>> dup array? [ 1array ] unless ] keep + [ find-row-index ] curry map sift unique f like ; + +: initial-selected-indices ( table -- set ) { [ model>> value>> empty? not ] [ selection-required?>> ] - [ drop { 0 } ] + [ drop { 0 } unique ] } 1&& ; -: (update-selected-indices) ( table -- {n}/f ) - [ selection>> value>> dup array? [ 1array ] unless ] keep - [ find-row-index ] curry map [ ] filter [ f ] when-empty ; - : update-selected-indices ( table -- {n}/f ) { [ (update-selected-indices) ] @@ -304,7 +322,7 @@ PRIVATE> } 1|| ; M: table model-changed - nip dup update-selected-indices [ { } ] unless* { + nip dup update-selected-indices { [ >>selected-indices f >>mouse-index drop ] [ [ f ] [ first ] if-empty show-row-summary ] [ drop update-selected ] @@ -319,7 +337,7 @@ M: table model-changed : add-selected-row ( table n -- ) [ scroll-to-row ] - [ push-selected-index relayout-1 ] 2bi ; + [ add-selected-index relayout-1 ] 2bi ; : (select-row) ( table n -- ) [ scroll-to-row ] @@ -337,12 +355,17 @@ M: table model-changed dup takes-focus?>> [ dup request-focus ] when swap '[ swap [ >>mouse-index ] _ bi ] [ drop ] if-mouse-row ; inline -: table-button-down ( table -- ) [ (select-row) ] swap (table-button-down) ; -: continued-button-down ( table -- ) dup multiple-selection?>> +: table-button-down ( table -- ) + [ (select-row) ] swap (table-button-down) ; + +: continued-button-down ( table -- ) + dup multiple-selection?>> [ [ add-selected-row ] swap (table-button-down) ] [ table-button-down ] if ; -: thru-button-down ( table -- ) dup multiple-selection?>> [ + +: thru-button-down ( table -- ) + dup multiple-selection?>> [ [ 2dup over selected-index (a,b) swap - [ swap push-selected-index drop ] curry each add-selected-row ] + [ swap add-selected-index drop ] curry each add-selected-row ] swap (table-button-down) ] [ table-button-down ] if ;