mirror of
https://github.com/FliegendeWurst/cursive.git
synced 2024-11-27 19:26:09 +00:00
Allow multiple callbacks to be registered per event.
This commit is contained in:
parent
2d62d2c91f
commit
0c24ed369b
@ -25,7 +25,7 @@ pub type ScreenId = usize;
|
|||||||
pub struct Cursive {
|
pub struct Cursive {
|
||||||
theme: theme::Theme,
|
theme: theme::Theme,
|
||||||
screens: Vec<views::StackView>,
|
screens: Vec<views::StackView>,
|
||||||
global_callbacks: HashMap<Event, Callback>,
|
global_callbacks: HashMap<Event, Vec<Callback>>,
|
||||||
menubar: views::Menubar,
|
menubar: views::Menubar,
|
||||||
|
|
||||||
// Last layer sizes of the stack view.
|
// Last layer sizes of the stack view.
|
||||||
@ -381,7 +381,9 @@ impl Cursive {
|
|||||||
F: Fn(&mut Cursive) + 'static,
|
F: Fn(&mut Cursive) + 'static,
|
||||||
{
|
{
|
||||||
self.global_callbacks
|
self.global_callbacks
|
||||||
.insert(event.into(), Callback::from_fn(cb));
|
.entry(event.into())
|
||||||
|
.or_insert(Vec::new())
|
||||||
|
.push(Callback::from_fn(cb));
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Add a layer to the current screen.
|
/// Add a layer to the current screen.
|
||||||
@ -420,13 +422,15 @@ impl Cursive {
|
|||||||
|
|
||||||
// Handles a key event when it was ignored by the current view
|
// Handles a key event when it was ignored by the current view
|
||||||
fn on_event(&mut self, event: Event) {
|
fn on_event(&mut self, event: Event) {
|
||||||
let cb = match self.global_callbacks.get(&event) {
|
let cb_list = match self.global_callbacks.get(&event) {
|
||||||
None => return,
|
None => return,
|
||||||
Some(cb) => cb.clone(),
|
Some(cb_list) => cb_list.clone(),
|
||||||
};
|
};
|
||||||
// Not from a view, so no viewpath here
|
// Not from a view, so no viewpath here
|
||||||
|
for cb in cb_list {
|
||||||
cb(self);
|
cb(self);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// Returns the size of the screen, in characters.
|
/// Returns the size of the screen, in characters.
|
||||||
pub fn screen_size(&self) -> Vec2 {
|
pub fn screen_size(&self) -> Vec2 {
|
||||||
|
Loading…
Reference in New Issue
Block a user