Skip to content

menubar should bubble up events which are not handled #493

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JoshMcguigan wants to merge 1 commit into
base: main
Choose a base branch
from
Open

menubar should bubble up events which are not handled #493

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions cursive-core/src/cursive.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -786,17 +786,26 @@ impl Cursive {
}

if self.menubar.receive_events() {
self.menubar.on_event(event).process(self);
} else {
let offset = if self.menubar.autohide { 0 } else { 1 };

let result =
View::on_event(&mut self.root, event.relativized((0, offset)));
let result = self.menubar.on_event(event.clone());

if let EventResult::Consumed(Some(cb)) = result {
cb(self);
// If the menubar handles this event, we return
// early so the event isn't handled twice. Otherwise
// the event should bubble up, even if the menubar is
// active, to ensure global callbacks are called.
return;
}
}

let offset = if self.menubar.autohide { 0 } else { 1 };

let result =
View::on_event(&mut self.root, event.relativized((0, offset)));

if let EventResult::Consumed(Some(cb)) = result {
cb(self);
}
}

/// Try to process a single callback.
Expand Down