From e6e32f052da39b20f7aefab1352df96948b232d7 Mon Sep 17 00:00:00 2001
From: Sam Anklesaria <sam@Tintin.local>
Date: Sun, 26 Apr 2009 19:01:05 -0500
Subject: [PATCH] frp tables

---
 extra/ui/frp/frp.factor | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/extra/ui/frp/frp.factor b/extra/ui/frp/frp.factor
index 685d9af124..6e9a03cd86 100644
--- a/extra/ui/frp/frp.factor
+++ b/extra/ui/frp/frp.factor
@@ -6,12 +6,16 @@ IN: ui.frp
 
 ! Layout utilities
 
+GENERIC: output-model ( gadget -- model )
+M: gadget output-model model>> ;
+M: frp-table output-model selected-value>> ;
+
 GENERIC: , ( object -- )
 M: gadget , make:, ;
 M: model , activate-model ;
 
 GENERIC: -> ( object -- model )
-M: gadget -> dup make:, model>> ;
+M: gadget -> dup make:, output-model ;
 M: model -> dup , ;
 
 : <box> ( models type -- track )
@@ -22,7 +26,9 @@ M: model -> dup , ;
 
 ! Gadgets
 : <frp-button> ( text -- button ) [ t swap set-control-value ] <bevel-button> f <model> >>model ;
-TUPLE: frp-table < table quot ;
+TUPLE: frp-table < table quot column-titles column-alignment ;
+M: frp-table column-titles column-titles>> ;
+M: frp-table column-alignment column-alignment>> ;
 M: frp-table row-columns quot>> call( a -- b ) ;
 : <frp-table> ( model quot -- table )
     frp-table new-line-gadget dup >>renderer swap >>quot swap >>model