ui.theme: updates to color scheme.

[factor.git] / basis / ui / gadgets / status-bar / status-bar.factor

diff --git a/basis/ui/gadgets/status-bar/status-bar.factor b/basis/ui/gadgets/status-bar/status-bar.factor
index a1c2dca23d04e3b91844f1a6f68efe09ad7323de..73b763c59f234b6f3d685c90dd1c5081f9d5d532 100644 (file)
--- a/basis/ui/gadgets/status-bar/status-bar.factor
+++ b/basis/ui/gadgets/status-bar/status-bar.factor
@@ -1,19 +1,31 @@
 ! Copyright (C) 2007, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors models models.delay models.arrow
-sequences ui.gadgets.labels ui.gadgets.tracks
-ui.gadgets.worlds ui.gadgets ui kernel calendar summary ;
+USING: accessors calendar colors.constants fonts kernel models
+models.arrow models.delay sequences summary ui
+ui.gadgets.borders ui.gadgets.labels ui.gadgets.tracks
+ui.gadgets.worlds ui.pens.solid ui.private ui.theme ;
 IN: ui.gadgets.status-bar
 
+: status-bar-font ( -- font )
+    sans-serif-font clone
+    status-bar-background >>background
+    status-bar-foreground >>foreground ;
+
+: status-bar-theme ( label -- label )
+    status-bar-font >>font
+    status-bar-background <solid> >>interior ;
+
 : <status-bar> ( model -- gadget )
     1/10 seconds <delay> [ "" like ] <arrow> <label-control>
-    reverse-video-theme
+    status-bar-theme
     t >>root? ;
 
-: open-status-window ( gadget title -- )
-    f <model> [ <world> ] keep
-    <status-bar> f track-add
+: open-status-window ( gadget title/attributes -- )
+    ?attributes f <model> >>status <world>
+    dup status>> <status-bar> 
+    { 7 2 } <filled-border> status-bar-background <solid> >>interior
+    f track-add
     open-world-window ;
 
 : show-summary ( object gadget -- )
-    [ [ summary ] [ "" ] if* ] dip show-status ;
+    [ [ safe-summary ] [ "" ] if* ] dip show-status ;