From 7ce12846cb9459cd78723984929b2a70418636d5 Mon Sep 17 00:00:00 2001
From: slava <slava@factorcode.org>
Date: Thu, 26 Oct 2006 04:07:18 +0000
Subject: [PATCH] Titled gadget fix and unit tests

---
 library/ui/load.factor               | 1 +
 library/ui/test/panes.factor         | 4 ++--
 library/ui/test/titled-gadget.factor | 7 +++++++
 library/ui/ui.factor                 | 6 +++---
 4 files changed, 13 insertions(+), 5 deletions(-)
 create mode 100644 library/ui/test/titled-gadget.factor

diff --git a/library/ui/load.factor b/library/ui/load.factor
index 294ddf3ff9..d5cde907d0 100644
--- a/library/ui/load.factor
+++ b/library/ui/load.factor
@@ -64,4 +64,5 @@ PROVIDE: library/ui
     "test/search.factor"
     "test/sliders.factor"
     "test/tracks.factor"
+    "test/titled-gadget.factor"
 } } ;
diff --git a/library/ui/test/panes.factor b/library/ui/test/panes.factor
index 5964cbd77e..7e9e7f6d47 100644
--- a/library/ui/test/panes.factor
+++ b/library/ui/test/panes.factor
@@ -1,9 +1,9 @@
 IN: temporary
-USING: gadgets-panes gadgets freetype namespaces kernel
+USING: alien gadgets-panes gadgets freetype namespaces kernel
 sequences io test prettyprint ;
 
 : maybe-with-freetype
-    freetype get [ call ] [ with-freetype ] if ; inline
+    freetype get expired? [ with-freetype ] [ call ] if ; inline
 
 : #children "pane" get gadget-children length ;
 
diff --git a/library/ui/test/titled-gadget.factor b/library/ui/test/titled-gadget.factor
new file mode 100644
index 0000000000..cc3f6f252d
--- /dev/null
+++ b/library/ui/test/titled-gadget.factor
@@ -0,0 +1,7 @@
+IN: temporary
+USING: gadgets-labels gadgets namespaces test ;
+
+"Hey" <label> "Foo" <titled-gadget> "t" set
+
+[ t ] [ "t" get focusable-child label? ] unit-test
+[ "Foo" ] [ "t" get gadget-title ] unit-test
diff --git a/library/ui/ui.factor b/library/ui/ui.factor
index 2de59eddf0..1fee57fbb1 100644
--- a/library/ui/ui.factor
+++ b/library/ui/ui.factor
@@ -57,15 +57,15 @@ SYMBOL: windows
         10 sleep
     ] assert-depth ;
 
-TUPLE: titled-gadget title ;
+TUPLE: titled-gadget title child ;
 
 M: titled-gadget gadget-title titled-gadget-title ;
 
-M: titled-gadget focusable-child* gadget-child ;
+M: titled-gadget focusable-child* titled-gadget-child ;
 
 C: titled-gadget ( gadget title -- )
     [ set-titled-gadget-title ] keep
-    { { f f f @center } } make-frame* ;
+    { { f set-titled-gadget-child f @center } } make-frame* ;
 
 : open-window ( world -- )
     dup pref-dim over set-gadget-dim