a-b-street/abstreet
1
1
Fork 0
mirror of https://github.com/a-b-street/abstreet.git synced 2024-11-24 17:37:22 +03:00
Code Issues Projects Releases Wiki Activity

aw yeah, unicode arrow key descriptions. and tweaking some wording from filip's feedback

Browse Source
This commit is contained in:
Dustin Carlino 2018-12-22 23:18:49 -08:00
parent 92ce83dfdd
commit 551a8ef63a
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
editor/src/plugins/edit/traffic_signal_editor.rs
View File

@ -334,13 +334,13 @@ fn choose_preset(
// closure. Grr.
let mut choices: Vec<(String, ControlTrafficSignal)> = Vec::new();
if let Some(ts) = ControlTrafficSignal::four_way_four_phase(map, id) {
choices.push(("4-phase".to_string(), ts));
choices.push(("four-phase".to_string(), ts));
}
if let Some(ts) = ControlTrafficSignal::four_way_two_phase(map, id) {
choices.push(("2-phase".to_string(), ts));
choices.push(("two-phase".to_string(), ts));
}
if let Some(ts) = ControlTrafficSignal::three_way(map, id) {
choices.push(("2-phase".to_string(), ts));
choices.push(("three-phase".to_string(), ts));
}
if let Some(ts) = ControlTrafficSignal::greedy_assignment(map, id) {
choices.push(("arbitrary assignment".to_string(), ts));

2
editor/src/ui.rs
View File

@ -60,7 +60,7 @@ impl<S: UIState> GUI<RenderingHints> for UI<S> {
],
),
Folder::new(
"Sim",
"Simulation",
vec![
(Key::LeftBracket, "slow down sim"),
(Key::RightBracket, "speed up sim"),

8
ezgui/src/event.rs
View File

@ -223,10 +223,10 @@ impl Key {
Key::LeftShift => "Shift".to_string(),
Key::LeftControl => "Control".to_string(),
Key::LeftAlt => "Alt".to_string(),
Key::LeftArrow => "Left arrow key".to_string(),
Key::RightArrow => "Right arrow key".to_string(),
Key::UpArrow => "Up arrow key".to_string(),
Key::DownArrow => "Down arrow key".to_string(),
Key::LeftArrow => "← arrow".to_string(),
Key::RightArrow => "→ arrow".to_string(),
Key::UpArrow => "↑".to_string(),
Key::DownArrow => "↓".to_string(),
// These have to_char, but override here
Key::Space => "Space".to_string(),
_ => self.to_char(false).unwrap().to_string(),