steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

History completion work in progress

db4
Slava Pestov 2009-01-13 19:08:49 -06:00
parent 21433c47ef
commit fd069442dc
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
basis/ui/gadgets/tables/tables.factor
View File

@ -107,7 +107,8 @@ M: table layout*
0 [ table-gap + + ] accumulate nip ; 0 [ table-gap + + ] accumulate nip ;
: column-line-offsets ( table -- xs ) : column-line-offsets ( table -- xs )
column-offsets rest-slice [ table-gap 2/ - ] map ; column-offsets
[ f ] [ rest-slice [ table-gap 2/ - ] map ] if-empty ;
: draw-columns ( table -- ) : draw-columns ( table -- )
[ column-line-color>> gl-color ] [ column-line-color>> gl-color ]

13
basis/ui/tools/listener/listener.factor
View File

@ -435,7 +435,8 @@ M: listener-gadget ungraft*
! Foo ! Foo
USING: summary ui.gadgets.labels ui.gadgets.tables colors ui.render USING: summary ui.gadgets.labels ui.gadgets.tables colors ui.render
ui.gadgets.worlds ui.gadgets.glass tools.completion ui.gadgets ; ui.gadgets.worlds ui.gadgets.glass tools.completion ui.gadgets
present ;
USE: tools.completion USE: tools.completion
: <summary-gadget> ( model -- gadget ) : <summary-gadget> ( model -- gadget )
@ -447,12 +448,12 @@ TUPLE: completion-popup < wrapper table interactor ;
[ completion-popup? ] find-parent ; [ completion-popup? ] find-parent ;
SINGLETON: completion-renderer SINGLETON: completion-renderer
M: completion-renderer row-columns drop name>> 1array ; M: completion-renderer row-columns drop present 1array ;
M: completion-renderer row-value drop ; M: completion-renderer row-value drop ;
: <completion-model> ( object object -- object ) : <completion-model> ( object object -- object )
[ one-word-elt <element-model> 1/3 seconds <delay> ] dip [ one-word-elt <element-model> 1/3 seconds <delay> ] dip
'[ [ { } ] [ @ keys 20 short head ] if-empty ] <filter> ; '[ @ keys 1000 short head ] <filter> ;
: hide-completion-popup ( popup -- ) : hide-completion-popup ( popup -- )
interactor>> f >>completion-popup find-world hide-glass ; interactor>> f >>completion-popup find-world hide-glass ;
@ -500,9 +501,11 @@ completion-popup H{
[ vocabs-matching ] [ words-matching ] ? [ vocabs-matching ] [ words-matching ] ?
show-completion-popup ; show-completion-popup ;
: history-matching ( string interactor -- alist )
history>> <reversed> dup zip completions ;
: history-completion-popup ( interactor -- ) : history-completion-popup ( interactor -- )
dup '[ _ history>> dup zip completions ] dup '[ _ history-matching ] show-completion-popup ;
show-completion-popup ;
: pass-to-popup? ( gesture interactor -- ? ) : pass-to-popup? ( gesture interactor -- ? )
[ [ key-down? ] [ key-up? ] bi or ] [ [ key-down? ] [ key-up? ] bi or ]