From f06ed96132ffd042606941032f8708f241883252 Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Sun, 13 Jul 2008 17:12:34 -0500
Subject: [PATCH 1/4] boids.ui: Rewrite to not use 'gadget,'
---
extra/boids/ui/ui.factor | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/extra/boids/ui/ui.factor b/extra/boids/ui/ui.factor
index 6b175eeb5e..f45b1cc0ff 100755
--- a/extra/boids/ui/ui.factor
+++ b/extra/boids/ui/ui.factor
@@ -114,6 +114,8 @@ VARS: population-label cohesion-label alignment-label separation-label ;
<frame>
+ <shelf>
+
{
[ "ESC - Pause" [ drop toggle-loop ] button* ]
@@ -139,7 +141,7 @@ VARS: population-label cohesion-label alignment-label separation-label ;
"e - +0.1" [ drop inc-separation-weight ] button* add-gadget
"d - -0.1" [ drop dec-separation-weight ] button* add-gadget ]
- } [ call ] map [ [ gadget, ] each ] make-shelf
+ } [ call ] map [ add-gadget ] each
1 over set-pack-fill
over @top grid-add
From 0b56d330618fea280683c5f2050f6e779548cc65 Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Sun, 13 Jul 2008 18:10:52 -0500
Subject: [PATCH 2/4] color-picker: Rewrite to not use 'gadget,'
---
extra/color-picker/color-picker.factor | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/extra/color-picker/color-picker.factor b/extra/color-picker/color-picker.factor
index 6fcf3c21cd..b5938a7ad7 100755
--- a/extra/color-picker/color-picker.factor
+++ b/extra/color-picker/color-picker.factor
@@ -15,7 +15,8 @@ TUPLE: color-preview < gadget ;
: <color-preview> ( model -- gadget )
color-preview new-gadget
- { 100 100 } over set-rect-dim ;
+ swap >>model
+ { 100 100 } >>dim ;
M: color-preview model-changed
swap model-value over set-gadget-interior relayout-1 ;
@@ -26,7 +27,10 @@ M: color-preview model-changed
: <color-sliders> ( -- model gadget )
3 [ 0 0 0 255 <range> ] replicate
dup [ range-model ] map <compose>
- swap [ [ <color-slider> gadget, ] each ] make-filled-pile ;
+ swap
+ <filled-pile>
+ swap
+ [ <color-slider> add-gadget ] each ;
: <color-picker> ( -- gadget )
[
From f125722bd92cb2f7ade8eea5016d59dd1159da2b Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Sun, 13 Jul 2008 18:12:59 -0500
Subject: [PATCH 3/4] ui.gadgets: Remove 'gadget,'
---
extra/ui/gadgets/gadgets-docs.factor | 4 ----
extra/ui/gadgets/gadgets.factor | 2 --
2 files changed, 6 deletions(-)
diff --git a/extra/ui/gadgets/gadgets-docs.factor b/extra/ui/gadgets/gadgets-docs.factor
index b9d12847be..47ae6b4733 100755
--- a/extra/ui/gadgets/gadgets-docs.factor
+++ b/extra/ui/gadgets/gadgets-docs.factor
@@ -180,10 +180,6 @@ HELP: focusable-child
{ $values { "gadget" gadget } { "child" gadget } }
{ $description "Outputs the child of the gadget which would prefer to receive keyboard focus." } ;
-HELP: gadget,
-{ $values { "gadget" gadget } }
-{ $description "Adds a new child to the gadget being constructed. This word can only be used from a quotation passed to " { $link make-gadget } "." } ;
-
HELP: make-gadget
{ $values { "gadget" gadget } { "quot" quotation } }
{ $description "Calls the quotation in a new scope with the gadget stored in the " { $link gadget } " variable." } ;
diff --git a/extra/ui/gadgets/gadgets.factor b/extra/ui/gadgets/gadgets.factor
index ebe3773ce9..ce0df019e7 100755
--- a/extra/ui/gadgets/gadgets.factor
+++ b/extra/ui/gadgets/gadgets.factor
@@ -357,8 +357,6 @@ M: f request-focus-on 2drop ;
: focus-path ( world -- seq )
[ focus>> ] follow ;
-: gadget, ( gadget -- ) gadget get swap add-gadget drop ;
-
: g ( -- gadget ) gadget get ;
: g-> ( x -- x x gadget ) dup g ;
From cd6a5592588f772adf33b451aa4af296b0adab1d Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Sun, 13 Jul 2008 19:01:51 -0500
Subject: [PATCH 4/4] ui.tools.search: Rewrite so as to remove variable based
ui words
---
extra/ui/tools/search/search.factor | 23 ++++++++++++-----------
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/extra/ui/tools/search/search.factor b/extra/ui/tools/search/search.factor
index 1d8f16de5a..0a8fe92762 100755
--- a/extra/ui/tools/search/search.factor
+++ b/extra/ui/tools/search/search.factor
@@ -47,12 +47,12 @@ search-field H{
{ T{ key-down f f "RET" } [ find-search-list invoke-value-action ] }
} set-gestures
-: <search-model> ( producer -- model )
- >r g live-search-field gadget-model
+: <search-model> ( live-search producer -- live-search filter )
+ >r dup field>> model>> ! live-search model :: producer
ui-running? [ 1/5 seconds <delay> ] when
[ "\n" join ] r> append <filter> ;
-: <search-list> ( seq limited? presenter -- gadget )
+: <search-list> ( live-search seq limited? presenter -- live-search list )
>r
[ limited-completions ] [ completions ] ? curry
<search-model>
@@ -60,14 +60,15 @@ search-field H{
swap <list> ;
: <live-search> ( string seq limited? presenter -- gadget )
- { 0 1 } live-search new-track
- [
- <search-field> g-> set-live-search-field f track,
- <search-list> g-> set-live-search-list
- <scroller> 1 track,
- ] make-gadget
- [ live-search-field set-editor-string ] keep
- [ live-search-field end-of-document ] keep ;
+ { 0 1 } live-search new-track
+ <search-field> >>field
+ dup field>> f track-add*
+ -roll <search-list> >>list
+ dup list>> <scroller> 1 track-add*
+
+ swap
+ over field>> set-editor-string
+ dup field>> end-of-document ;
M: live-search focusable-child* live-search-field ;