a-b-street/abstreet
1
1
Fork 0
mirror of https://github.com/a-b-street/abstreet.git synced 2024-12-26 16:02:23 +03:00
Code Issues Projects Releases Wiki Activity

using MultiKey a bit more consistently

Browse Source
This commit is contained in:
Dustin Carlino 2019-05-29 14:12:21 -07:00
parent 53e2c3e905
commit 9faa2bf143
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
editor/src/edit/traffic_signals.rs
View File

@ -5,7 +5,9 @@ use crate::helpers::ID;
use crate::render::{draw_signal_cycle, draw_signal_diagram, DrawCtx, DrawOptions, DrawTurn};
use crate::ui::{ShowEverything, UI};
use abstutil::Timer;
use ezgui::{hotkey, Color, EventCtx, GeomBatch, GfxCtx, Key, ModalMenu, Wizard, WrappedWizard};
use ezgui::{
hotkey, Color, EventCtx, GeomBatch, GfxCtx, Key, ModalMenu, MultiKey, Wizard, WrappedWizard,
};
use geom::Duration;
use map_model::{ControlTrafficSignal, Cycle, IntersectionID, Map, TurnID, TurnPriority, TurnType};
@ -298,7 +300,7 @@ fn choose_preset(
) -> Option<ControlTrafficSignal> {
// TODO I wanted to do all of this work just once per wizard, but we can't touch map inside a
// closure. Grr.
let choices: Vec<(Option<Key>, String, ControlTrafficSignal)> =
let choices: Vec<(Option<MultiKey>, String, ControlTrafficSignal)> =
ControlTrafficSignal::get_possible_policies(map, id)
.into_iter()
.map(|(name, ts)| (None, name, ts))

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

@ -1,7 +1,5 @@
use crate::widgets::{Menu, Position};
use crate::{
hotkey, Canvas, GfxCtx, InputResult, Key, LogScroller, MultiKey, Text, TextBox, UserInput,
};
use crate::{Canvas, GfxCtx, InputResult, LogScroller, MultiKey, Text, TextBox, UserInput};
use abstutil::Cloneable;
use std::collections::VecDeque;
@ -177,7 +175,7 @@ impl<'a> WrappedWizard<'a> {
pub fn choose_something<R: 'static + Clone + Cloneable>(
&mut self,
query: &str,
choices_generator: Box<Fn() -> Vec<(Option<Key>, String, R)>>,
choices_generator: Box<Fn() -> Vec<(Option<MultiKey>, String, R)>>,
) -> Option<(String, R)> {
if !self.ready_results.is_empty() {
let first = self.ready_results.pop_front().unwrap();
@ -201,7 +199,7 @@ impl<'a> WrappedWizard<'a> {
}
if self.wizard.menu.is_none() {
let choices: Vec<(Option<Key>, String, R)> = choices_generator();
let choices: Vec<(Option<MultiKey>, String, R)> = choices_generator();
if choices.is_empty() {
self.wizard.log_scroller = Some(LogScroller::new(
"Wizard".to_string(),
@ -211,7 +209,7 @@ impl<'a> WrappedWizard<'a> {
}
let boxed_choices: Vec<(Option<MultiKey>, String, Box<Cloneable>)> = choices
.into_iter()
.map(|(key, s, item)| (key.and_then(hotkey), s, item.clone_box()))
.map(|(multikey, s, item)| (multikey, s, item.clone_box()))
.collect();
self.wizard.menu = Some(Menu::new(
Text::prompt(query),
@ -266,7 +264,7 @@ impl<'a> WrappedWizard<'a> {
pub fn choose_string(&mut self, query: &str, choices: Vec<&str>) -> Option<String> {
// Clone the choices outside of the closure to get around the fact that choices_generator's
// lifetime isn't correctly specified.
let copied_choices: Vec<(Option<Key>, String, ())> = choices
let copied_choices: Vec<(Option<MultiKey>, String, ())> = choices
.into_iter()
.map(|s| (None, s.to_string(), ()))
.collect();
@ -281,10 +279,9 @@ impl<'a> WrappedWizard<'a> {
) -> Option<String> {
// Clone the choices outside of the closure to get around the fact that choices_generator's
// lifetime isn't correctly specified.
let copied_choices: Vec<(Option<Key>, String, ())> = choices
let copied_choices: Vec<(Option<MultiKey>, String, ())> = choices
.into_iter()
// TODO Argh, change all the APIs to take MultiKey
.map(|(multikey, s)| (multikey.map(|mk| mk.key), s.to_string(), ()))
.map(|(multikey, s)| (multikey, s.to_string(), ()))
.collect();
self.choose_something(query, Box::new(move || copied_choices.clone()))
.map(|(s, _)| s)