a-b-street/abstreet
1
1
Fork 0
mirror of https://github.com/a-b-street/abstreet.git synced 2024-12-01 10:44:56 +03:00
Code Issues Projects Releases Wiki Activity

X button on popup menus

Browse Source
This commit is contained in:
Dustin Carlino 2020-02-10 13:38:14 -08:00
parent 66c983d119
commit 82f149db56
2 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ezgui/src/widgets/popup_menu.rs
View File

@ -112,9 +112,6 @@ impl<T: Clone> PopupMenu<T> {
if self.current_idx < self.choices.len() - 1 {
self.current_idx += 1;
}
} else if ctx.input.new_was_pressed(hotkey(Key::Escape).unwrap()) {
self.state = InputResult::Canceled;
return;
}
}

28
ezgui/src/widgets/wizard.rs
View File

@ -284,10 +284,21 @@ impl<'a, 'b> WrappedWizard<'a, 'b> {
col.push(ManagedWidget::menu("menu"));
self.wizard.menu_comp = Some(
Composite::new(
ManagedWidget::col(col)
.bg(Color::grey(0.4))
.outline(5.0, Color::WHITE)
.padding(5),
ManagedWidget::row(vec![
ManagedWidget::col(col),
// TODO nice text button
ManagedWidget::btn(Button::text_bg(
Text::from(Line("X").fg(Color::BLACK)),
Color::WHITE,
Color::ORANGE,
hotkey(Key::Escape),
"quit",
self.ctx,
)),
])
.bg(Color::grey(0.4))
.outline(5.0, Color::WHITE)
.padding(5),
)
.aligned(horiz, vert)
.menu(
@ -316,7 +327,14 @@ impl<'a, 'b> WrappedWizard<'a, 'b> {
return None;
}
self.wizard.menu_comp.as_mut().unwrap().event(self.ctx);
match self.wizard.menu_comp.as_mut().unwrap().event(self.ctx) {
Some(Outcome::Clicked(x)) if x == "quit" => {
self.wizard.alive = false;
self.wizard.menu_comp = None;
return None;
}
_ => {}
}
let (result, destroy) = match self.wizard.menu_comp.as_ref().unwrap().menu("menu").state {
InputResult::Canceled => {