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

UI listener: make history completion popup wider, use correct element type when inserting completions

db4
Slava Pestov 2009-02-06 01:25:43 -06:00
parent ae0da1cf98
commit e3d4b88e8f
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
basis/ui/tools/listener/completion/completion.factor
View File

@ -47,6 +47,11 @@ M: vocab-completion completion-banner drop "Vocabularies:" ;
M: char-completion completion-banner drop "Unicode code point names:" ; M: char-completion completion-banner drop "Unicode code point names:" ;
M: history-completion completion-banner drop "Input history:" ; M: history-completion completion-banner drop "Input history:" ;
GENERIC: completion-popup-width ( interactor completion-mode -- x )
M: object completion-popup-width 2drop 300 ;
M: history-completion completion-popup-width drop dim>> first ;
! Completion modes also implement the row renderer protocol ! Completion modes also implement the row renderer protocol
M: listener-completion row-columns drop present 1array ; M: listener-completion row-columns drop present 1array ;
@ -100,8 +105,10 @@ M: completion-popup hide-glass-hook
: hide-completion-popup ( popup -- ) : hide-completion-popup ( popup -- )
find-world hide-glass ; find-world hide-glass ;
: completion-loc/doc ( popup -- loc doc ) : completion-loc/doc/elt ( popup -- loc doc elt )
interactor>> [ editor-caret ] [ model>> ] bi ; [ interactor>> [ editor-caret ] [ model>> ] bi ]
[ completion-mode>> completion-element ]
bi ;
GENERIC: completion-string ( object -- string ) GENERIC: completion-string ( object -- string )
@ -117,8 +124,7 @@ M: engine-word completion-string method-completion-string ;
GENERIC# accept-completion-hook 1 ( item popup -- ) GENERIC# accept-completion-hook 1 ( item popup -- )
: insert-completion ( item popup -- ) : insert-completion ( item popup -- )
[ completion-string ] [ completion-loc/doc ] bi* [ completion-string ] [ completion-loc/doc/elt ] bi* set-elt-string ;
one-word-elt set-elt-string ;
: accept-completion ( item table -- ) : accept-completion ( item table -- )
find-completion-popup find-completion-popup
@ -135,15 +141,14 @@ GENERIC# accept-completion-hook 1 ( item popup -- )
t >>selection-required? t >>selection-required?
dup '[ _ accept-completion ] >>action ; dup '[ _ accept-completion ] >>action ;
: <completion-scroller> ( object -- object ) : <completion-scroller> ( completion-popup -- scroller )
<limited-scroller> [ table>> ] [ interactor>> ] [ completion-mode>> ] tri completion-popup-width
{ 300 120 } >>min-dim [ <limited-scroller> ] [ 120 2array ] bi* [ >>min-dim ] [ >>max-dim ] bi ;
{ 300 120 } >>max-dim ;
: <completion-popup> ( interactor completion-mode -- popup ) : <completion-popup> ( interactor completion-mode -- popup )
[ vertical completion-popup new-track ] 2dip [ vertical completion-popup new-track ] 2dip
[ [ >>interactor ] [ >>completion-mode ] bi* ] [ <completion-table> >>table ] 2bi [ [ >>interactor ] [ >>completion-mode ] bi* ] [ <completion-table> >>table ] 2bi
dup [ table>> <completion-scroller> ] [ completion-mode>> completion-banner ] bi dup [ <completion-scroller> ] [ completion-mode>> completion-banner ] bi
<labelled-gadget> 1 track-add <labelled-gadget> 1 track-add
COLOR: white <solid> >>interior ; COLOR: white <solid> >>interior ;