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

editor gadget now uses gadget-selection protocol

slava 2006-07-28 23:15:03 +00:00
parent 1e419e6580
commit 0b8c907ec5
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
library/ui/text/commands.factor
View File

@ -14,8 +14,8 @@ sequences ;
dup editor-caret click-loc ; dup editor-caret click-loc ;
: editor-copy ( editor clipboard -- ) : editor-copy ( editor clipboard -- )
over editor-selection? [ over gadget-selection? [
>r [ editor-selection ] keep r> copy-clipboard >r [ gadget-selection ] keep r> copy-clipboard
] [ ] [
2drop 2drop
] if ; ] if ;
@ -24,7 +24,7 @@ sequences ;
dupd editor-copy remove-editor-selection ; dupd editor-copy remove-editor-selection ;
: delete/backspace ( elt editor quot -- | quot: caret editor -- from to ) : delete/backspace ( elt editor quot -- | quot: caret editor -- from to )
over editor-selection? [ over gadget-selection? [
drop nip remove-editor-selection drop nip remove-editor-selection
] [ ] [
over >r >r dup editor-caret* swap control-model over >r >r dup editor-caret* swap control-model

4
library/ui/text/editor.factor
View File

@ -186,10 +186,10 @@ M: editor draw-gadget* ( gadget -- )
M: editor pref-dim* ( editor -- dim ) M: editor pref-dim* ( editor -- dim )
dup editor-width swap editor-height 2array ; dup editor-width swap editor-height 2array ;
: editor-selection? ( editor -- ? ) M: editor gadget-selection? ( editor -- ? )
selection-start/end = not ; selection-start/end = not ;
: editor-selection ( editor -- str ) M: editor gadget-selection ( editor -- str )
[ selection-start/end ] keep control-model doc-range ; [ selection-start/end ] keep control-model doc-range ;
: remove-editor-selection ( editor -- ) : remove-editor-selection ( editor -- )