ui.frp uses table constructor

diff --git a/basis/ui/gadgets/tables/tables.factor b/basis/ui/gadgets/tables/tables.factor
index e0c8a497c37a73e340de15a29c73d6bd34ef5c30..8848a0fe7757be6fd77fb624522f06aefcb84ad8 100644 (file)
--- 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 ] <illusion> ;
 M: table (>>selected-value) [ [ out>in ] <illusion> ] 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 ] <illusion> ;
+M: table (>>selected-index*) [ [ out>in ] <illusion> ] 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 fa71d78e5dd1fb6d9dc60ac4e430afe91c7a3a31..4e38dc634e4a825778e04ae375e4f721f8d30b2d 100644 (file)
--- 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* ;
 
-: <frp-table> ( 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 ;
+: <frp-table> ( model -- table ) f frp-table new-table dup >>renderer ;
 : <frp-table*> ( -- table ) f <model> <frp-table> ;
 : <frp-list> ( model -- table ) <frp-table> [ 1array ] >>quot ;
 : <frp-list*> ( -- table ) f <model> <frp-list> ;