Fix an UI bug and remove some pick usages
parent
6c98591880
commit
a8d1ec34f8
|
@ -2,7 +2,7 @@ USING: continuations documents ui.tools.interactor
|
|||
ui.tools.listener hashtables kernel namespaces parser sequences
|
||||
tools.test ui.commands ui.gadgets ui.gadgets.editors
|
||||
ui.gadgets.panes vocabs words tools.test.ui slots.private
|
||||
threads arrays generic threads accessors listener ;
|
||||
threads arrays generic threads accessors listener math ;
|
||||
IN: ui.tools.listener.tests
|
||||
|
||||
[ f ] [ "word" source-editor command-map commands>> empty? ] unit-test
|
||||
|
@ -51,3 +51,5 @@ IN: ui.tools.listener.tests
|
|||
|
||||
[ ] [ "listener" get com-end ] unit-test
|
||||
] with-grafted-gadget
|
||||
|
||||
[ ] [ \ + <pane> <interactor> interactor-use use-if-necessary ] unit-test
|
||||
|
|
|
@ -101,8 +101,8 @@ M: engine-word word-completion-string
|
|||
"engine-generic" word-prop word-completion-string ;
|
||||
|
||||
: use-if-necessary ( word seq -- )
|
||||
over vocabulary>> [
|
||||
2dup assoc-stack pick = [ 2drop ] [
|
||||
over vocabulary>> over and [
|
||||
2dup [ assoc-stack ] keep = [ 2drop ] [
|
||||
>r vocabulary>> vocab-words r> push
|
||||
] if
|
||||
] [ 2drop ] if ;
|
||||
|
@ -114,9 +114,10 @@ M: engine-word word-completion-string
|
|||
2bi ;
|
||||
|
||||
: quot-action ( interactor -- lines )
|
||||
dup control-value
|
||||
dup "\n" join pick add-interactor-history
|
||||
swap select-all ;
|
||||
[ control-value ] keep
|
||||
[ [ "\n" join ] dip add-interactor-history ]
|
||||
[ select-all ]
|
||||
2bi ;
|
||||
|
||||
TUPLE: stack-display < track ;
|
||||
|
||||
|
|
|
@ -40,11 +40,11 @@ IN: ui.tools
|
|||
|
||||
: resize-workspace ( workspace -- )
|
||||
dup sizes>> over control-value zero? [
|
||||
1/5 1 pick set-nth
|
||||
4/5 2 rot set-nth
|
||||
1/5 over set-second
|
||||
4/5 swap set-third
|
||||
] [
|
||||
2/3 1 pick set-nth
|
||||
1/3 2 rot set-nth
|
||||
2/3 over set-second
|
||||
1/3 swap set-third
|
||||
] if relayout ;
|
||||
|
||||
M: workspace model-changed
|
||||
|
|
Loading…
Reference in New Issue