ui.theme: updates to color scheme.

[factor.git] / basis / ui / tools / browser / browser.factor

diff --git a/basis/ui/tools/browser/browser.factor b/basis/ui/tools/browser/browser.factor
index 13cdd8e61fdf75ad83559cf27e77753933139900..c106a22b95a24fad8f469d94e7e15f6573e19e3f 100644 (file)
--- a/basis/ui/tools/browser/browser.factor
+++ b/basis/ui/tools/browser/browser.factor
@@ -1,16 +1,17 @@
 ! Copyright (C) 2006, 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors arrays assocs classes combinators
-combinators.short-circuit compiler.units debugger fry hashtables
-help help.apropos help.crossref help.home help.markup
-help.stylesheet help.topics io.styles kernel locals make models
-namespaces sequences sets ui ui.commands ui.gadgets
-ui.gadgets.borders ui.gadgets.editors ui.gadgets.glass
-ui.gadgets.labels ui.gadgets.panes ui.gadgets.scrollers
-ui.gadgets.status-bar ui.gadgets.theme ui.gadgets.toolbar
-ui.gadgets.tracks ui.gadgets.viewports ui.gadgets.worlds
-ui.gestures ui.pens.solid ui.tools.browser.history
-ui.tools.browser.popups ui.tools.common vocabs ;
+USING: accessors arrays assocs classes colors.constants
+combinators combinators.short-circuit compiler.units debugger
+documents fry help help.apropos help.crossref help.home
+help.markup help.stylesheet help.topics io.styles kernel locals
+make models namespaces sequences sets ui ui.commands ui.gadgets
+ui.gadgets.borders ui.gadgets.editors ui.gadgets.editors.private
+ui.gadgets.glass ui.gadgets.labels ui.gadgets.labels.private
+ui.gadgets.panes ui.gadgets.scrollers ui.gadgets.status-bar
+ui.theme ui.gadgets.theme ui.gadgets.toolbar ui.gadgets.tracks
+ui.gadgets.viewports ui.gadgets.worlds ui.gestures ui.pens.solid
+ui.render ui.text ui.tools.common ui.tools.browser.history
+ui.tools.browser.popups vocabs ;
 IN: ui.tools.browser
 
 TUPLE: browser-gadget < tool history scroller search-field popup ;
@@ -45,22 +46,18 @@ CONSTANT: next 1
     [ prefix 1array ] dip add-navigation-arrow , ;
 
 :: ($navigation) ( topic direction -- )
-    topic [
-        direction prev/next-article
-        [ 1array \ $long-link direction $navigation-arrow ] when*
-    ] { } make [ ($navigation-table) ] unless-empty ;
+    help-path-style get [
+        topic [
+            direction prev/next-article
+            [ 1array \ $long-link direction $navigation-arrow ] when*
+        ] { } make [ ($navigation-table) ] unless-empty
+    ] with-style ;
 
 : $navigation ( topic direction -- )
-    title-style get [
-        help-path-style get [
-            ($navigation)
-        ] with-style
-    ] with-style ;
+    title-style get [ ($navigation) ] with-style ;
 
 : $title ( topic -- )
-    title-style get
-    help-header-background page-color associate
-    assoc-union dup
+    title-style get clone page-color over delete-at dup
     [
         [
             [ ($title) ]
@@ -104,12 +101,18 @@ CONSTANT: next 1
 
 : <search-field> ( browser -- field )
     '[ _ search-browser ] <action-field>
+        [ theme-font-colors ] change-editor
+        "Search" >>default-text
         10 >>min-cols
         10 >>max-cols
         white-interior ;
 
 : <browser-toolbar> ( browser -- toolbar )
-    [ <toolbar> ] [ search-field>> "Search" label-on-left 1 track-add ] bi ;
+    [ <toolbar> ] [
+        search-field>> horizontal <track>
+            0 >>fill swap 1 track-add
+        1 track-add
+    ] bi ;
 
 : add-browser-toolbar ( track -- track )
     dup <browser-toolbar> format-toolbar f track-add ;