color-picker: fix using

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

diff --git a/extra/color-picker/color-picker.factor b/extra/color-picker/color-picker.factor
index 285e9ffad1394b9d3b5562951c020b77d95258e5..f3bee968fec967beb8f04cbcd0e8c26e9911b6e7 100644 (file)
--- a/extra/color-picker/color-picker.factor
+++ b/extra/color-picker/color-picker.factor
@@ -1,9 +1,9 @@
 ! Copyright (C) 2006, 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors colors formatting kernel math math.functions
-math.vectors models models.arrow models.product models.range sequences
-ui ui.gadgets ui.gadgets.labels ui.gadgets.packs ui.gadgets.sliders
-ui.gadgets.tracks ui.pens.solid ;
+USING: accessors colors formatting kernel math math.vectors
+models models.arrow models.product models.range sequences ui
+ui.gadgets ui.gadgets.labels ui.gadgets.packs ui.gadgets.sliders
+ui.gadgets.tracks ui.pens.solid ui.tools.common ;
 IN: color-picker
 
 ! Simple example demonstrating the use of models.
@@ -30,21 +30,17 @@ M: color-preview model-changed
     [ [ range-model ] map <product> ]
     bi ;
 
+: color>str ( seq -- str )
+    vtruncate v>integer first3 3dup "%d %d %d #%02x%02x%02x" sprintf ;
+
 : <color-picker> ( -- gadget )
-    vertical <track>
-        { 5 5 } >>gap
-        <color-sliders>
-        [ f track-add ]
-        [
-            [ <color-model> <color-preview> 1 track-add ]
-            [
-                [
-                    [ truncate ] map v>integer
-                    first3 3dup "%d %d %d #%02x%02x%02x" sprintf
-                ] <arrow> <label-control>
-                f track-add
-            ] bi
-        ] bi* ;
+    vertical <track> { 5 5 } >>gap
+    <color-sliders>
+    [ f track-add ]
+    [
+        [ <color-model> <color-preview> 1 track-add ]
+        [ [ color>str ] <arrow> <label-control> white-interior f track-add ] bi
+    ] bi* ;
 
 MAIN-WINDOW: color-picker-window { { title "Color Picker" } }
     <color-picker> >>gadgets ;