From 83a1e9f07c73333c283c588766b3e4e4471980a8 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Thu, 12 Feb 2009 01:40:33 -0600
Subject: [PATCH] color-picker: fix lamer indentation, clean up

---
 extra/color-picker/color-picker.factor | 44 +++++++++++++-------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/extra/color-picker/color-picker.factor b/extra/color-picker/color-picker.factor
index 5ae268374e..0f3055b3b5 100755
--- a/extra/color-picker/color-picker.factor
+++ b/extra/color-picker/color-picker.factor
@@ -1,4 +1,4 @@
-! Copyright (C) 2006, 2008 Slava Pestov.
+! Copyright (C) 2006, 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: kernel math math.functions math.parser models
 models.filter models.range models.compose sequences ui
@@ -9,15 +9,12 @@ IN: color-picker
 
 ! Simple example demonstrating the use of models.
 
-: <color-slider> ( model -- gadget )
-    <x-slider> 1 >>line ;
-
 TUPLE: color-preview < gadget ;
 
 : <color-preview> ( model -- gadget )
     color-preview new-gadget
-      swap        >>model
-      { 100 100 } >>dim ;
+        swap >>model
+        { 100 100 } >>dim ;
 
 M: color-preview model-changed
     swap value>> >>interior relayout-1 ;
@@ -25,25 +22,28 @@ M: color-preview model-changed
 : <color-model> ( model -- model )
     [ first3 [ 256 /f ] tri@ 1 <rgba> <solid> ] <filter> ;
 
-: <color-sliders> ( -- model gadget )
+: <color-slider> ( model -- gadget )
+    horizontal <slider> 1 >>line ;
+
+: <color-sliders> ( -- gadget model )
     3 [ 0 0 0 255 <range> ] replicate
-    dup [ range-model ] map <compose>
-    swap
-    <filled-pile>
-    swap
-      [ <color-slider> add-gadget ] each ;
+    [ <filled-pile> { 5 5 } >>gap [ <color-slider> add-gadget ] reduce ]
+    [ [ range-model ] map <compose> ]
+    bi ;
 
 : <color-picker> ( -- gadget )
-  <frame>
-    <color-sliders>
-      swap dup
-      [                               @top    grid-add ]
-      [ <color-model> <color-preview> @center grid-add ]
-      [
-        [ [ truncate number>string ] map " " join ] <filter> <label-control>
-        @bottom grid-add
-      ]
-      tri* ;
+    <frame>
+        { 5 5 } >>gap
+        <color-sliders>
+        [ @top grid-add ]
+        [
+            [ <color-model> <color-preview> @center grid-add ]
+            [
+                [ [ truncate number>string ] map " " join ]
+                <filter> <label-control>
+                @bottom grid-add
+            ] bi
+        ] bi* ;
 
 : color-picker-window ( -- )
     [ <color-picker> "Color Picker" open-window ] with-ui ;