From c75f6155cf425963c45bbd641e10e2da9b30a8de Mon Sep 17 00:00:00 2001
From: nicolas-p <z.nicolas@gmail.com>
Date: Sun, 19 Jul 2015 21:33:15 +0200
Subject: [PATCH] New toolbar dictionary

---
 basis/ui/gadgets/buttons/buttons.factor | 18 +-----------------
 basis/ui/gadgets/toolbar/toolbar.factor | 23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+), 17 deletions(-)
 create mode 100644 basis/ui/gadgets/toolbar/toolbar.factor

diff --git a/basis/ui/gadgets/buttons/buttons.factor b/basis/ui/gadgets/buttons/buttons.factor
index 4e6f62c27f..cb4f020231 100644
--- a/basis/ui/gadgets/buttons/buttons.factor
+++ b/basis/ui/gadgets/buttons/buttons.factor
@@ -121,9 +121,8 @@ PRIVATE>
         [ append theme-image ] tri-curry@ tri
     ] 2dip <tile-pen> ;
 
-CONSTANT: button-background COLOR: grey95
+CONSTANT: button-background COLOR: FactorLightTan
 CONSTANT: button-clicked-background COLOR: FactorDarkSlateBlue
-CONSTANT: toolbar-border COLOR: grey75
 
 : <border-button-pen> ( -- pen )
     "button" button-background button-clicked-background
@@ -243,18 +242,3 @@ PRIVATE>
     target command command-button-quot
     '[ drop @ ] <border-button>
     gesture gesture>tooltip >>tooltip ; inline
-
-: <toolbar> ( target -- toolbar )
-    <shelf>
-        1 >>fill
-        { 5 5 } >>gap
-        swap
-        [ [ "toolbar" ] dip class-of get-command-at commands>> ]
-        [ '[ [ _ ] 2dip <command-button> add-gadget ] ]
-        bi assoc-each ;
-
-: add-toolbar ( track -- track )
-    dup <toolbar> { 3 3 } <border> 
-    button-background <solid> >>interior
-    toolbar-border <solid-underlined> >>boundary
-    align-left f track-add ;
diff --git a/basis/ui/gadgets/toolbar/toolbar.factor b/basis/ui/gadgets/toolbar/toolbar.factor
new file mode 100644
index 0000000000..638a3d2f57
--- /dev/null
+++ b/basis/ui/gadgets/toolbar/toolbar.factor
@@ -0,0 +1,23 @@
+! Copyright (C) 2015 Nicolas Pénet.
+! See http://factorcode.org/license.txt for BSD license.
+USING: accessors assocs classes colors.constants fry kernel
+ui.commands ui.gadgets ui.gadgets.borders ui.gadgets.buttons
+ui.gadgets.buttons.private ui.gadgets.packs ui.gadgets.tracks
+ui.pens.solid ;
+IN: ui.gadgets.toolbar
+
+CONSTANT: toolbar-background COLOR: grey95
+
+: <toolbar> ( target -- toolbar )
+    <shelf>
+        1 >>fill
+        { 5 5 } >>gap
+        swap
+        [ [ "toolbar" ] dip class-of get-command-at commands>> ]
+        [ '[ [ _ ] 2dip <command-button> add-gadget ] ]
+        bi assoc-each ;
+
+: add-toolbar ( track -- track )
+    dup <toolbar> { 3 3 } <border> 
+    toolbar-background <solid> >>interior
+    align-left f track-add ;