From 870846c7df6ee863c9c5d6b93cc01659b29f8502 Mon Sep 17 00:00:00 2001
From: slava <slava@factorcode.org>
Date: Fri, 1 Sep 2006 02:18:42 +0000
Subject: [PATCH] Keyboard focus sent to search field in help and browser tools

---
 library/ui/tools/browser.factor |  6 ++++--
 library/ui/tools/help.factor    |  4 +++-
 library/ui/tools/search.factor  | 10 ----------
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/library/ui/tools/browser.factor b/library/ui/tools/browser.factor
index c9b89be61f..2f4fa88065 100644
--- a/library/ui/tools/browser.factor
+++ b/library/ui/tools/browser.factor
@@ -7,7 +7,7 @@ namespaces gadgets-tracks gadgets-presentations gadgets-grids
 gadgets-frames help gadgets-buttons gadgets-search ;
 IN: gadgets-browser
 
-TUPLE: browser navigator definitions ;
+TUPLE: browser navigator definitions search ;
 
 TUPLE: definitions showing ;
 
@@ -86,9 +86,11 @@ C: browser ( -- gadget )
     {
         { [ <navigator> ] set-browser-navigator f 1/5 }
         { [ <definitions> ] set-browser-definitions [ <scroller> ] 3/5 }
-        { [ [ apropos ] <search-gadget> ] f f 1/5 }
+        { [ [ apropos ] <search-gadget> ] set-browser-search f 1/5 }
     } { 0 1 } make-track* ;
 
+M: browser focusable-child* browser-search ;
+
 : show-vocab ( vocab browser -- )
     browser-navigator navigator-vocab set-model* ;
 
diff --git a/library/ui/tools/help.factor b/library/ui/tools/help.factor
index 91cb94a0a1..e1305d6339 100644
--- a/library/ui/tools/help.factor
+++ b/library/ui/tools/help.factor
@@ -29,5 +29,7 @@ help-gadget {
 C: help-gadget ( -- gadget )
     dup init-history {
         { [ <help-pane> ] f f 4/5 }
-        { [ [ search-help. ] <search-gadget> ] f f 1/5 }
+        { [ [ search-help. ] <search-gadget> ] set-help-gadget-search f 1/5 }
     } { 1 0 } make-track* ;
+
+M: help-gadget focusable-child* help-gadget-search ;
diff --git a/library/ui/tools/search.factor b/library/ui/tools/search.factor
index 3e5846170f..ea4020e4ba 100644
--- a/library/ui/tools/search.factor
+++ b/library/ui/tools/search.factor
@@ -25,13 +25,3 @@ C: search-gadget ( quot -- )
     } make-frame* ;
 
 M: search-gadget focusable-child* search-gadget-input ;
-
-M: search-gadget pref-dim* drop { 400 500 } ;
-
-: apropos-window
-    [ apropos ] <search-gadget>
-    "Apropos" open-titled-window ;
-
-: search-help-window
-    [ search-help. ] <search-gadget>
-    "Search help" open-titled-window ;