ui.tools.search: Rewrite so as to remove variable based ui words
parent
f125722bd9
commit
cd6a559258
|
@ -47,12 +47,12 @@ search-field H{
|
||||||
{ T{ key-down f f "RET" } [ find-search-list invoke-value-action ] }
|
{ T{ key-down f f "RET" } [ find-search-list invoke-value-action ] }
|
||||||
} set-gestures
|
} set-gestures
|
||||||
|
|
||||||
: <search-model> ( producer -- model )
|
: <search-model> ( live-search producer -- live-search filter )
|
||||||
>r g live-search-field gadget-model
|
>r dup field>> model>> ! live-search model :: producer
|
||||||
ui-running? [ 1/5 seconds <delay> ] when
|
ui-running? [ 1/5 seconds <delay> ] when
|
||||||
[ "\n" join ] r> append <filter> ;
|
[ "\n" join ] r> append <filter> ;
|
||||||
|
|
||||||
: <search-list> ( seq limited? presenter -- gadget )
|
: <search-list> ( live-search seq limited? presenter -- live-search list )
|
||||||
>r
|
>r
|
||||||
[ limited-completions ] [ completions ] ? curry
|
[ limited-completions ] [ completions ] ? curry
|
||||||
<search-model>
|
<search-model>
|
||||||
|
@ -60,14 +60,15 @@ search-field H{
|
||||||
swap <list> ;
|
swap <list> ;
|
||||||
|
|
||||||
: <live-search> ( string seq limited? presenter -- gadget )
|
: <live-search> ( string seq limited? presenter -- gadget )
|
||||||
{ 0 1 } live-search new-track
|
{ 0 1 } live-search new-track
|
||||||
[
|
<search-field> >>field
|
||||||
<search-field> g-> set-live-search-field f track,
|
dup field>> f track-add*
|
||||||
<search-list> g-> set-live-search-list
|
-roll <search-list> >>list
|
||||||
<scroller> 1 track,
|
dup list>> <scroller> 1 track-add*
|
||||||
] make-gadget
|
|
||||||
[ live-search-field set-editor-string ] keep
|
swap
|
||||||
[ live-search-field end-of-document ] keep ;
|
over field>> set-editor-string
|
||||||
|
dup field>> end-of-document ;
|
||||||
|
|
||||||
M: live-search focusable-child* live-search-field ;
|
M: live-search focusable-child* live-search-field ;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue