rename on-activate as on-input-finished
it's just too easily confused with "active" as in commander state.active
This commit is contained in:
parent
9775e00545
commit
561c717609
19
command.fnl
19
command.fnl
@ -98,7 +98,7 @@
|
||||
state)
|
||||
)))
|
||||
|
||||
(fn on-activate [self str]
|
||||
(fn on-input-finished [self str]
|
||||
(let [s (next-action self str)
|
||||
param (if s.active (. (. s.command :params) s.this-param))]
|
||||
(set self.state s)
|
||||
@ -126,11 +126,12 @@
|
||||
completions (completer str)]
|
||||
(parent:foreach #(parent:remove $1))
|
||||
(each [text _w (pairs completions)]
|
||||
(parent:add (Gtk.Button {
|
||||
:label text
|
||||
:on_clicked
|
||||
#(update-widget-state self (self:on-activate text))
|
||||
})))
|
||||
(parent:add
|
||||
(Gtk.Button {
|
||||
:label text
|
||||
:on_clicked
|
||||
#(update-widget-state self (self:on-input-finished text))
|
||||
})))
|
||||
(parent:show_all)
|
||||
)))
|
||||
|
||||
@ -160,7 +161,7 @@
|
||||
:collected-params supplied-params
|
||||
}]
|
||||
(set self.state s)
|
||||
(let [r (self:on-activate nil)]
|
||||
(let [r (self:on-input-finished nil)]
|
||||
(update-widget-state self r)
|
||||
(self.entry:grab_focus)
|
||||
r)))
|
||||
@ -181,7 +182,7 @@
|
||||
: deactivate
|
||||
:active? (fn [self] self.state.active)
|
||||
: on-input
|
||||
: on-activate
|
||||
: on-input-finished
|
||||
: invoke-interactively
|
||||
: entry
|
||||
:widget box
|
||||
@ -198,7 +199,7 @@
|
||||
(self:on-input event.text)))
|
||||
(tset entry :on_activate
|
||||
(fn [event]
|
||||
(let [result (self:on-activate event.text)]
|
||||
(let [result (self:on-input-finished event.text)]
|
||||
(update-widget-state self result))))
|
||||
self))
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user