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 Dialog focus after removing buttons

Browse Source
This commit is contained in:
Alexandre Bury 2021-03-02 09:10:36 -08:00
parent dd141dd810
commit 7101c174f2
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cursive-core/src/views/dialog.rs
View File

@ -230,7 +230,8 @@ impl Dialog {
pub fn clear_buttons(&mut self) { pub fn clear_buttons(&mut self) {
self.buttons.clear(); self.buttons.clear();
self.invalidate(); self.invalidate();
// Fix focus? self.content.take_focus(Direction::none());
self.focus = DialogFocus::Content;
} }
/// Removes a button from this dialog. /// Removes a button from this dialog.
@ -242,6 +243,17 @@ impl Dialog {
self.buttons.remove(i); self.buttons.remove(i);
self.invalidate(); self.invalidate();
// Fix focus? // Fix focus?
match (self.buttons.len(), self.focus) {
// TODO: take focus?
(0, ref mut focus) => {
self.content.take_focus(Direction::none());
*focus = DialogFocus::Content;
}
(n, DialogFocus::Button(ref mut i)) => {
*i = usize::min(*i, n - 1);
}
_ => (),
}
} }
/// Sets the horizontal alignment for the buttons, if any. /// Sets the horizontal alignment for the buttons, if any.