diff --git a/basis/ui/gadgets/tables/tables.factor b/basis/ui/gadgets/tables/tables.factor index e0c8a497c3..8848a0fe77 100644 --- a/basis/ui/gadgets/tables/tables.factor +++ b/basis/ui/gadgets/tables/tables.factor @@ -57,8 +57,8 @@ M: table selected-value>> selected-values>> [ in>out ] ; M: table (>>selected-value) [ [ out>in ] ] dip (>>selected-values) ; M: table selected-index>> selected-indices>> in>out ; M: table (>>selected-index) [ out>in ] dip (>>selected-indices) ; -M: table selected-index*>> selected-indices*>> in>out ; -M: table (>>selected-index*) [ out>in ] dip (>>selected-indices*) ; +M: table selected-index*>> selected-indices*>> [ in>out ] ; +M: table (>>selected-index*) [ [ out>in ] ] dip (>>selected-indices*) ; IN: ui.gadgets.tables : push-selected-index ( table n -- table ) 2dup swap selected-indices>> index [ drop ] [ over selected-indices>> push ] if ; diff --git a/extra/ui/frp/frp.factor b/extra/ui/frp/frp.factor index fa71d78e5d..4e38dc634e 100644 --- a/extra/ui/frp/frp.factor +++ b/extra/ui/frp/frp.factor @@ -65,11 +65,7 @@ M: frp-table row-columns quot>> [ call( a -- b ) ] [ drop f ] if* ; M: frp-table row-value val-quot>> [ call( a -- b ) ] [ drop f ] if* ; M: frp-table row-color color-quot>> [ call( a -- b ) ] [ drop f ] if* ; -: ( model -- table ) - frp-table new-line-gadget dup >>renderer swap >>model - f basic-model new-model >>selected-values sans-serif-font >>font - focus-border-color >>focus-border-color - transparent >>column-line-color ; +: ( model -- table ) f frp-table new-table dup >>renderer ; : ( -- table ) f ; : ( model -- table ) [ 1array ] >>quot ; : ( -- table ) f ;