Merge branch 'master' of git://factorcode.org/git/factor

db4
Eduardo Cavazos 2007-12-15 14:58:54 -06:00
commit 2087abdbf2
4 changed files with 24 additions and 14 deletions

View File

@ -34,14 +34,10 @@ focused? ;
: field-theme ( gadget -- )
gray <solid> swap set-gadget-boundary ;
: construct-editor ( class -- tuple )
>r <editor> { set-gadget-delegate } r> construct
: construct-editor ( object class -- tuple )
>r { set-gadget-delegate } r> construct
dup dup set-editor-self ; inline
TUPLE: source-editor ;
: <source-editor> source-editor construct-editor ;
: activate-editor-model ( editor model -- )
2dup add-connection
dup activate-model
@ -340,9 +336,6 @@ M: editor gadget-text* editor-string % ;
: delete-to-end-of-line T{ one-line-elt } editor-backspace ;
editor "general" f {
{ T{ key-down f f "RET" } insert-newline }
{ T{ key-down f { S+ } "RET" } insert-newline }
{ T{ key-down f f "ENTER" } insert-newline }
{ T{ key-down f f "DELETE" } delete-next-character }
{ T{ key-down f { S+ } "DELETE" } delete-next-character }
{ T{ key-down f f "BACKSPACE" } delete-previous-character }
@ -448,6 +441,23 @@ editor "selection" f {
{ T{ key-down f { S+ C+ } "END" } select-end-of-document }
} define-command-map
! Multi-line editors
TUPLE: multiline-editor ;
: <multiline-editor> ( -- editor )
<editor> multiline-editor construct-editor ;
multiline-editor "general" f {
{ T{ key-down f f "RET" } insert-newline }
{ T{ key-down f { S+ } "RET" } insert-newline }
{ T{ key-down f f "ENTER" } insert-newline }
} define-command-map
TUPLE: source-editor ;
: <source-editor> ( -- editor )
<multiline-editor> source-editor construct-editor ;
! Fields are like editors except they edit an external model
TUPLE: field model editor ;

View File

@ -95,7 +95,7 @@ deploy-gadget "toolbar" f {
{ f com-help }
{ f com-revert }
{ f com-save }
{ T{ key-down f f "RETURN" } com-deploy }
{ T{ key-down f f "RET" } com-deploy }
} define-command-map
: buttons,

View File

@ -33,9 +33,8 @@ help ;
: <interactor> ( output -- gadget )
<source-editor>
{ set-interactor-output set-gadget-delegate }
interactor construct
dup dup set-editor-self
interactor construct-editor
tuck set-interactor-output
dup init-interactor-history
dup init-caret-help ;

View File

@ -33,7 +33,8 @@ M: live-search handle-gesture* ( gadget gesture delegate -- ? )
TUPLE: search-field ;
: <search-field> ( -- gadget ) search-field construct-editor ;
: <search-field> ( -- gadget )
<editor> search-field construct-editor ;
search-field H{
{ T{ key-down f f "UP" } [ find-search-list select-previous ] }