New buttons

basis/ui/gadgets/buttons/buttons.factor

@@ -1,6 +1,6 @@
 ! Copyright (C) 2005, 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors assocs classes colors.constants combinators
+USING: accessors assocs classes colors colors.constants combinators
 combinators.short-circuit combinators.smart fry kernel locals
 math.vectors models namespaces sequences ui.commands ui.gadgets
 ui.gadgets.borders ui.gadgets.colors ui.gadgets.labels ui.gadgets.packs
@@ -121,13 +121,10 @@ PRIVATE>
         [ append theme-image ] tri-curry@ tri
     ] 2dip <tile-pen> ;
 
-CONSTANT: button-background COLOR: FactorLightTan
-CONSTANT: button-clicked-background COLOR: FactorDarkSlateBlue
-
 : <border-button-pen> ( -- pen )
-    "button" button-background button-clicked-background
+    "button" transparent button-text-color
     <border-button-state-pen> dup
-    "button-clicked" button-clicked-background COLOR: white
+    "button-clicked" transparent button-clicked-text-color
     <border-button-state-pen> dup dup
     <button-pen> ;
 

basis/ui/gadgets/colors/colors.factor

@@ -12,6 +12,9 @@ CONSTANT: menu-border-color COLOR: grey75
 CONSTANT: status-bar-background COLOR: FactorDarkSlateBlue
 CONSTANT: status-bar-foreground COLOR: white
 
+CONSTANT: button-text-color COLOR: FactorDarkSlateBlue
+CONSTANT: button-clicked-text-color COLOR: white
+
 CONSTANT: line-color COLOR: grey75
 
 CONSTANT: column-title-background COLOR: grey95