diff --git a/extra/ui/frp/frp.factor b/extra/ui/frp/frp.factor index f5c0f1bd10..aa7c44ee03 100644 --- a/extra/ui/frp/frp.factor +++ b/extra/ui/frp/frp.factor @@ -14,11 +14,12 @@ 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 quot -- table ) - frp-table new-line-gadget dup >>renderer swap >>quot swap >>model +: ( model -- table ) + frp-table new-line-gadget dup >>renderer [ ] >>quot swap >>model f >>selected-value sans-serif-font >>font focus-border-color >>focus-border-color transparent >>column-line-color ; +: ( model -- table ) [ 1array ] >>quot ; : ( -- field ) f ; ! Layout utilities @@ -27,11 +28,11 @@ GENERIC: output-model ( gadget -- model ) M: gadget output-model model>> ; M: frp-table output-model selected-value>> ; -GENERIC: , ( object -- ) +GENERIC: , ( uiitem -- ) M: gadget , make:, ; M: model , activate-model ; -GENERIC: -> ( object -- model ) +GENERIC: -> ( uiitem -- model ) M: gadget -> dup make:, output-model ; M: model -> dup , ; M: table -> dup , selected-value>> ;