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)
|
state)
|
||||||
)))
|
)))
|
||||||
|
|
||||||
(fn on-activate [self str]
|
(fn on-input-finished [self str]
|
||||||
(let [s (next-action self str)
|
(let [s (next-action self str)
|
||||||
param (if s.active (. (. s.command :params) s.this-param))]
|
param (if s.active (. (. s.command :params) s.this-param))]
|
||||||
(set self.state s)
|
(set self.state s)
|
||||||
@ -126,11 +126,12 @@
|
|||||||
completions (completer str)]
|
completions (completer str)]
|
||||||
(parent:foreach #(parent:remove $1))
|
(parent:foreach #(parent:remove $1))
|
||||||
(each [text _w (pairs completions)]
|
(each [text _w (pairs completions)]
|
||||||
(parent:add (Gtk.Button {
|
(parent:add
|
||||||
:label text
|
(Gtk.Button {
|
||||||
:on_clicked
|
:label text
|
||||||
#(update-widget-state self (self:on-activate text))
|
:on_clicked
|
||||||
})))
|
#(update-widget-state self (self:on-input-finished text))
|
||||||
|
})))
|
||||||
(parent:show_all)
|
(parent:show_all)
|
||||||
)))
|
)))
|
||||||
|
|
||||||
@ -160,7 +161,7 @@
|
|||||||
:collected-params supplied-params
|
:collected-params supplied-params
|
||||||
}]
|
}]
|
||||||
(set self.state s)
|
(set self.state s)
|
||||||
(let [r (self:on-activate nil)]
|
(let [r (self:on-input-finished nil)]
|
||||||
(update-widget-state self r)
|
(update-widget-state self r)
|
||||||
(self.entry:grab_focus)
|
(self.entry:grab_focus)
|
||||||
r)))
|
r)))
|
||||||
@ -181,7 +182,7 @@
|
|||||||
: deactivate
|
: deactivate
|
||||||
:active? (fn [self] self.state.active)
|
:active? (fn [self] self.state.active)
|
||||||
: on-input
|
: on-input
|
||||||
: on-activate
|
: on-input-finished
|
||||||
: invoke-interactively
|
: invoke-interactively
|
||||||
: entry
|
: entry
|
||||||
:widget box
|
:widget box
|
||||||
@ -198,7 +199,7 @@
|
|||||||
(self:on-input event.text)))
|
(self:on-input event.text)))
|
||||||
(tset entry :on_activate
|
(tset entry :on_activate
|
||||||
(fn [event]
|
(fn [event]
|
||||||
(let [result (self:on-activate event.text)]
|
(let [result (self:on-input-finished event.text)]
|
||||||
(update-widget-state self result))))
|
(update-widget-state self result))))
|
||||||
self))
|
self))
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user