arnekeller/cursive
1
0
Fork 0
mirror of https://github.com/FliegendeWurst/cursive.git synced 2024-11-23 17:35:00 +00:00
Code Issues Projects Releases Wiki Activity

Fix focus cycle on dialogs without buttons

Browse Source
This commit is contained in:
Alexandre Bury 2018-07-24 22:37:39 -07:00
parent e63e1e4916
commit c49d18034d
1 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/views/dialog.rs
View File

@ -286,16 +286,38 @@ impl Dialog {
match self.content.on_event( match self.content.on_event(
event.relativized((self.padding + self.borders).top_left()), event.relativized((self.padding + self.borders).top_left()),
) { ) {
EventResult::Ignored if !self.buttons.is_empty() => { EventResult::Ignored => {
match event { if !self.buttons.is_empty() {
Event::Key(Key::Down) match event {
| Event::Key(Key::Tab) Event::Key(Key::Down)
| Event::Shift(Key::Tab) => { | Event::Key(Key::Tab)
// Default to leftmost button when going down. | Event::Shift(Key::Tab) => {
self.focus = DialogFocus::Button(0); // Default to leftmost button when going down.
EventResult::Consumed(None) self.focus = DialogFocus::Button(0);
EventResult::Consumed(None)
}
_ => EventResult::Ignored,
}
} else {
match event {
Event::Shift(Key::Tab) => {
if self.content.take_focus(Direction::back()) {
self.focus = DialogFocus::Content;
EventResult::Consumed(None)
} else {
EventResult::Ignored
}
}
Event::Key(Key::Tab) => {
if self.content.take_focus(Direction::front()) {
self.focus = DialogFocus::Content;
EventResult::Consumed(None)
} else {
EventResult::Ignored
}
}
_ => EventResult::Ignored,
} }
_ => EventResult::Ignored,
} }
} }
res => res, res => res,