From 14b83dc2195f6bacd116f613f2411dae0e75b61e Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Thu, 7 Aug 2008 15:45:36 -0500
Subject: [PATCH 1/4] cfdg.models.rules08: Use new macros
---
extra/cfdg/models/rules08/rules08.factor | 34 +++++++-----------------
1 file changed, 9 insertions(+), 25 deletions(-)
diff --git a/extra/cfdg/models/rules08/rules08.factor b/extra/cfdg/models/rules08/rules08.factor
index 20099d225a..f5398582c9 100644
--- a/extra/cfdg/models/rules08/rules08.factor
+++ b/extra/cfdg/models/rules08/rules08.factor
@@ -17,37 +17,21 @@ DEFER: line
: ligne ( -- )
{
- { 1 [ 4.5 y 1.15 0.8 size* -0.3 b line ] do }
+ { 1 [ 4.5 y 1.15 0.8 size* -0.3 b line ] }
{ 0.5 [ ] }
}
- call-random-weighted ;
+ rules ;
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-: line ( -- ) [ insct ligne ] recursive ;
-
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+: line ( -- ) { [ insct ligne ] } rule ;
: sole ( -- )
- [
- {
- {
- 1 [
- [ 1 brightness 0.5 saturation ligne ] do
- [ 140 r 1 hue sole ] do
- ]
- }
- { 0.01 [ ] }
- }
- call-random-weighted
- ]
- recursive ;
+ {
+ { 1 [ 1 brightness 0.5 saturation ligne ] [ 140 r 1 hue sole ] }
+ { 0.01 [ ] }
+ }
+ rules ;
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-: centre ( -- )
- [ 1 b 5 s circle ] do
- [ sole ] do ;
+: centre ( -- ) { [ 1 b 5 s circle ] [ sole ] } rule ;
! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
From f891a057aff5d440e93880f30703b45d9f8ac86a Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Thu, 7 Aug 2008 15:46:11 -0500
Subject: [PATCH 2/4] Move colors to basis
---
{extra => basis}/colors/authors.txt | 0
{extra => basis}/colors/colors.factor | 0
{extra => basis}/colors/hsv/authors.txt | 0
{extra => basis}/colors/hsv/hsv.factor | 0
4 files changed, 0 insertions(+), 0 deletions(-)
rename {extra => basis}/colors/authors.txt (100%)
rename {extra => basis}/colors/colors.factor (100%)
rename {extra => basis}/colors/hsv/authors.txt (100%)
rename {extra => basis}/colors/hsv/hsv.factor (100%)
diff --git a/extra/colors/authors.txt b/basis/colors/authors.txt
similarity index 100%
rename from extra/colors/authors.txt
rename to basis/colors/authors.txt
diff --git a/extra/colors/colors.factor b/basis/colors/colors.factor
similarity index 100%
rename from extra/colors/colors.factor
rename to basis/colors/colors.factor
diff --git a/extra/colors/hsv/authors.txt b/basis/colors/hsv/authors.txt
similarity index 100%
rename from extra/colors/hsv/authors.txt
rename to basis/colors/hsv/authors.txt
diff --git a/extra/colors/hsv/hsv.factor b/basis/colors/hsv/hsv.factor
similarity index 100%
rename from extra/colors/hsv/hsv.factor
rename to basis/colors/hsv/hsv.factor
From d311893363bb8fda1d63f5b84955c3a79a235e37 Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Thu, 7 Aug 2008 17:10:17 -0500
Subject: [PATCH 3/4] ui.gadgets.theme: Use 'gray' color objects
---
extra/ui/gadgets/theme/theme.factor | 38 ++++++++++++++---------------
1 file changed, 19 insertions(+), 19 deletions(-)
diff --git a/extra/ui/gadgets/theme/theme.factor b/extra/ui/gadgets/theme/theme.factor
index 20f560e309..46fa0105a3 100644
--- a/extra/ui/gadgets/theme/theme.factor
+++ b/extra/ui/gadgets/theme/theme.factor
@@ -18,41 +18,41 @@ IN: ui.gadgets.theme
: plain-gradient
T{ gradient f {
- T{ rgba f 0.94 0.94 0.94 1.0 }
- T{ rgba f 0.83 0.83 0.83 1.0 }
- T{ rgba f 0.83 0.83 0.83 1.0 }
- T{ rgba f 0.62 0.62 0.62 1.0 }
+ T{ gray f 0.94 1.0 }
+ T{ gray f 0.83 1.0 }
+ T{ gray f 0.83 1.0 }
+ T{ gray f 0.62 1.0 }
} } ;
: rollover-gradient
T{ gradient f {
- T{ rgba f 1.0 1.0 1.0 1.0 }
- T{ rgba f 0.9 0.9 0.9 1.0 }
- T{ rgba f 0.9 0.9 0.9 1.0 }
- T{ rgba f 0.75 0.75 0.75 1.0 }
+ T{ gray f 1.0 1.0 }
+ T{ gray f 0.9 1.0 }
+ T{ gray f 0.9 1.0 }
+ T{ gray f 0.75 1.0 }
} } ;
: pressed-gradient
T{ gradient f {
- T{ rgba f 0.75 0.75 0.75 1.0 }
- T{ rgba f 0.9 0.9 0.9 1.0 }
- T{ rgba f 0.9 0.9 0.9 1.0 }
- T{ rgba f 1.0 1.0 1.0 1.0 }
+ T{ gray f 0.75 1.0 }
+ T{ gray f 0.9 1.0 }
+ T{ gray f 0.9 1.0 }
+ T{ gray f 1.0 1.0 }
} } ;
: selected-gradient
T{ gradient f {
- T{ rgba f 0.65 0.65 0.65 1.0 }
- T{ rgba f 0.8 0.8 0.8 1.0 }
- T{ rgba f 0.8 0.8 0.8 1.0 }
- T{ rgba f 1.0 1.0 1.0 1.0 }
+ T{ gray f 0.65 1.0 }
+ T{ gray f 0.8 1.0 }
+ T{ gray f 0.8 1.0 }
+ T{ gray f 1.0 1.0 }
} } ;
: lowered-gradient
T{ gradient f {
- T{ rgba f 0.37 0.37 0.37 1.0 }
- T{ rgba f 0.43 0.43 0.43 1.0 }
- T{ rgba f 0.5 0.5 0.5 1.0 }
+ T{ gray f 0.37 1.0 }
+ T{ gray f 0.43 1.0 }
+ T{ gray f 0.5 1.0 }
} } ;
: sans-serif-font { "sans-serif" plain 12 } ;
From 708e24fcb0c22063b11a0a50d0a0f3cde449618d Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Thu, 7 Aug 2008 17:16:09 -0500
Subject: [PATCH 4/4] ui.gadgets.buttons: Minor '<radio-buttons>' update
---
extra/ui/gadgets/buttons/buttons.factor | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/extra/ui/gadgets/buttons/buttons.factor b/extra/ui/gadgets/buttons/buttons.factor
index c5a5e8bad8..d60901d993 100755
--- a/extra/ui/gadgets/buttons/buttons.factor
+++ b/extra/ui/gadgets/buttons/buttons.factor
@@ -199,14 +199,11 @@ M: radio-control model-changed
: <radio-button> ( value model label -- gadget )
<radio-knob> label-on-right radio-button-theme <radio-control> ;
-: radio-buttons-theme ( gadget -- )
- { 5 5 } >>gap drop ;
-
: <radio-buttons> ( model assoc -- gadget )
<filled-pile>
-rot
[ <radio-button> ] <radio-controls>
- dup radio-buttons-theme ;
+ { 5 5 } >>gap ;
: <toggle-button> ( value model label -- gadget )
<radio-control> bevel-button-theme ;