colors: merge colors.constants and colors.hex.

[factor.git] / extra / color-table / color-table.factor

diff --git a/extra/color-table/color-table.factor b/extra/color-table/color-table.factor
index 296c39264ee27fb72f738d3760b1199e4b2e9cc6..ea7d6f5d63b428f862c006a1cebec2dda745d910 100644 (file)
--- a/extra/color-table/color-table.factor
+++ b/extra/color-table/color-table.factor
@@ -1,9 +1,9 @@
 ! Copyright (C) 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors colors.constants colors.hex combinators
-combinators.smart formatting kernel literals models
-sorting.human sorting.slots strings ui ui.gadgets.scrollers
-ui.gadgets.search-tables ui.gadgets.tables ;
+USING: accessors colors combinators combinators.smart formatting
+kernel literals math models sorting.human sorting.slots strings ui
+ui.gadgets.scrollers ui.gadgets.search-tables ui.gadgets.tables
+;
 IN: color-table
 
 ! ui.gadgets.tables demo
@@ -13,6 +13,10 @@ SINGLETON: color-renderer
 
 CONSTANT: full-block-string $[ 10 CHAR: full-block <string> ]
 
+: rgba>hex ( rgba -- hex )
+    [ red>> ] [ green>> ] [ blue>> ] tri
+    [ 255 * >integer ] tri@ "%02X%02X%02X" sprintf ;
+
 PRIVATE>
 
 M: color-renderer filled-column
@@ -24,7 +28,7 @@ M: color-renderer column-titles
 M: color-renderer row-columns
     drop [
         full-block-string swap
-        dup lookup-color {
+        dup named-color {
             [ red>> "%.5f" sprintf ]
             [ green>> "%.5f" sprintf ]
             [ blue>> "%.5f" sprintf ]
@@ -33,10 +37,10 @@ M: color-renderer row-columns
     ] output>array ;
 
 M: color-renderer row-color
-    drop lookup-color ;
+    drop named-color ;
 
 M: color-renderer row-value
-    drop lookup-color ;
+    drop named-color ;
 
 : <color-table> ( -- table )
     named-colors { human<=> } sort-by <model>