From 0b90cda9e2faf12ad10204eb6e9271d7a7f35183 Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Mon, 14 Jul 2008 18:35:30 -0500
Subject: [PATCH] ui.gadgets.labelled: refactor

---
 extra/ui/gadgets/labelled/labelled.factor | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/extra/ui/gadgets/labelled/labelled.factor b/extra/ui/gadgets/labelled/labelled.factor
index 2cb69d6061..8f504aea14 100755
--- a/extra/ui/gadgets/labelled/labelled.factor
+++ b/extra/ui/gadgets/labelled/labelled.factor
@@ -5,17 +5,16 @@ ui.gadgets.labels ui.gadgets.panes ui.gadgets.scrollers
 ui.gadgets.tracks ui.gadgets.theme ui.gadgets.frames
 ui.gadgets.grids io kernel math models namespaces prettyprint
 sequences sequences words classes.tuple ui.gadgets ui.render
-colors ;
+colors accessors ;
 IN: ui.gadgets.labelled
 
 TUPLE: labelled-gadget < track content ;
 
 : <labelled-gadget> ( gadget title -- newgadget )
-    { 0 1 } labelled-gadget new-track
-    [
-        <label> reverse-video-theme f track,
-        g-> set-labelled-gadget-content 1 track,
-    ] make-gadget ;
+  { 0 1 } labelled-gadget new-track
+    swap <label> reverse-video-theme f track-add*
+    swap >>content
+    dup content>> 1 track-add* ;
 
 M: labelled-gadget focusable-child* labelled-gadget-content ;
 
@@ -50,10 +49,9 @@ TUPLE: closable-gadget < frame content ;
     [ [ closable-gadget? ] is? ] find-parent ;
 
 : <closable-gadget> ( gadget title quot -- gadget )
-    closable-gadget new-frame 
-    [
-        <title-bar> @top frame,
-        g-> set-closable-gadget-content @center frame,
-    ] make-gadget ;
-
+  closable-gadget new-frame
+    -rot <title-bar> @top grid-add*
+    swap >>content
+    dup content>> @center grid-add* ;
+    
 M: closable-gadget focusable-child* closable-gadget-content ;