]> gitweb.factorcode.org Git - factor.git/commitdiff
color-picker: small refactoring
authorBjörn Lindqvist <bjourne@gmail.com>
Wed, 4 Nov 2015 09:03:52 +0000 (10:03 +0100)
committerBjörn Lindqvist <bjourne@gmail.com>
Wed, 4 Nov 2015 09:03:52 +0000 (10:03 +0100)
extra/color-picker/color-picker.factor

index 038134b30915b39deb5b874de2baf8aa126cea47..46dbae8da132633330b2736569345a2362ff303c 100644 (file)
@@ -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 ]
-            [
-                [
-                    vtruncate 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> f track-add ] bi
+    ] bi* ;
 
 MAIN-WINDOW: color-picker-window { { title "Color Picker" } }
     <color-picker> >>gadgets ;