UI completion cleanups

diff --git a/TODO.FACTOR.txt b/TODO.FACTOR.txt
index c29dfcbf54f492f6b9c37a7dccf53464758c0cb5..ab1e3bc86e28bb8951bd9aa1ac472999d6de6076 100644 (file)
--- a/TODO.FACTOR.txt
+++ b/TODO.FACTOR.txt
@@ -13,7 +13,8 @@
 - help search looks funny
 - menus should not require mouse to be held
 - tab completion: add a USE: if necessary
-- reloading buttons.factor fails
+- completion is not ideal: eg, search for "buttons"
+- live search: timer delay would be nice
 
 + ui:
 

diff --git a/library/ui/tools/browser.factor b/library/ui/tools/browser.factor
index 0528ef2757bf3098dbe7861baf4be4a45d2be211..5568b9be455cd433d0447e30cfe1e57bc6bd0c76 100644 (file)
--- a/library/ui/tools/browser.factor
+++ b/library/ui/tools/browser.factor
@@ -98,7 +98,7 @@ C: browser ( -- gadget )
         {
             [ "" [ browser call-tool ] <word-search> ]
             set-browser-search
-            f
+            [ "Word search" <labelled-gadget> ]
             1/5
         }
     } { 0 1 } make-track* ;

diff --git a/library/ui/tools/help.factor b/library/ui/tools/help.factor
index 936650b42237da62abcc1fa13073934ac059f350..d7ee7834733c5ba025e274a60d30b9aad3d5245c 100644 (file)
--- a/library/ui/tools/help.factor
+++ b/library/ui/tools/help.factor
@@ -31,7 +31,7 @@ C: help-gadget ( -- gadget )
         {
             [ "" [ help-gadget call-tool ] <help-search> ]
             set-help-gadget-search
-            f
+            [ "Help search" <labelled-gadget> ]
             1/5
         }
     } { 0 1 } make-track* ;

diff --git a/library/ui/tools/listener.factor b/library/ui/tools/listener.factor
index 4a7cc763aef13ee6532000e0d7a9ed11d333f728..3d5390f5b33d453b77bb04da5df03e41c493154a 100644 (file)
--- a/library/ui/tools/listener.factor
+++ b/library/ui/tools/listener.factor
@@ -108,14 +108,18 @@ M: listener-gadget tool-help
 
 : show-word-search ( listener action -- )
     >r dup listener-gadget-input selected-word r>
-    <word-search> swap show-minibuffer ;
+    <word-search> "Word search" <labelled-gadget>
+    swap show-minibuffer ;
 
 : show-source-files-search ( listener action -- )
-    "" swap <source-files-search> swap show-minibuffer ;
+    "" swap <source-files-search>
+    "Source file search" <labelled-gadget>
+    swap show-minibuffer ;
 
 : show-vocabs-search ( listener action -- )
     >r dup listener-gadget-input selected-word r>
-    <vocabs-search> swap show-minibuffer ;
+    <vocabs-search> "Vocabulary search" <labelled-gadget>
+    swap show-minibuffer ;
 
 : show-list ( seq presenter action listener -- )
     >r >r >r <model> r> r> <list> <scroller> r>

diff --git a/library/ui/tools/search.factor b/library/ui/tools/search.factor
index e3e8fd03ef16a76b2916f9af590397ec4fbd3e4c..eb81ce19b127afcb1a19cfbdfc63ccdcc70131a6 100644 (file)
--- a/library/ui/tools/search.factor
+++ b/library/ui/tools/search.factor
@@ -19,7 +19,7 @@ C: search-field ( string -- gadget )
     <editor> over set-gadget-delegate
     dup dup set-control-self
     [ set-editor-text ] keep
-    [ select-all ] keep ;
+    [ editor-doc-end ] keep ;
 
 search-field H{
     { T{ key-down f f "UP" } [ find-search-list select-prev ] }
@@ -63,12 +63,12 @@ M: live-search focusable-child* live-search-field ;
     all-words
     [ word-completions ] curry
     [ word-completion. ]
-    <live-search> "Word search" <labelled-gadget> ;
+    <live-search> ;
 
 : <help-search> ( string action -- gadget )
     [ search-help ]
     [ first ($link) ]
-    <live-search> "Help search" <labelled-gadget> ;
+    <live-search> ;
 
 : string-completion. ( pair quot -- )
     >r first2 over completion>string swap r> call write-object ;
@@ -78,10 +78,10 @@ M: live-search focusable-child* live-search-field ;
     source-files get hash-keys natural-sort
     [ string-completions ] curry
     [ [ <pathname> ] string-completion. ]
-    <live-search> "Source file search" <labelled-gadget> ;
+    <live-search> ;
 
 : <vocabs-search> ( string action -- gadget )
     vocabs
     [ string-completions ] curry
     [ [ <vocab-link> ] string-completion. ]
-    <live-search> "Vocabulary search" <labelled-gadget> ;
+    <live-search> ;