From 00840f1bbc4e77d74e8cefdcd40c946530654b31 Mon Sep 17 00:00:00 2001 From: Dustin Carlino Date: Fri, 28 Aug 2020 16:35:10 -0700 Subject: [PATCH] Now that @michaelkirk figured out how to preserve space, use it in a few more places in the UI. There are a few remaining places in the tutorial that use "- ", but I think the bullet point style is reasonable there. Maybe a Unicode dot would look better. --- game/src/devtools/destinations.rs | 2 +- game/src/edit/traffic_signals/mod.rs | 2 +- game/src/info/building.rs | 6 ++++-- game/src/info/person.rs | 4 ++-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/game/src/devtools/destinations.rs b/game/src/devtools/destinations.rs index d135c2263d..88905d57bd 100644 --- a/game/src/devtools/destinations.rs +++ b/game/src/devtools/destinations.rs @@ -162,7 +162,7 @@ impl State for PopularDestinations { ))); for (names, amenity) in &app.primary.map.get_b(b).amenities { txt.add(Line(format!( - "- {} ({})", + " {} ({})", names.get(app.opts.language.as_ref()), amenity ))); diff --git a/game/src/edit/traffic_signals/mod.rs b/game/src/edit/traffic_signals/mod.rs index 4a0efa8a10..52b6fa4bf6 100644 --- a/game/src/edit/traffic_signals/mod.rs +++ b/game/src/edit/traffic_signals/mod.rs @@ -580,7 +580,7 @@ fn make_side_panel( ); } for r in road_names { - txt.add(Line(format!("- {}", r))); + txt.add(Line(format!(" {}", r))); } } else { txt.add(Line(format!("{} intersections", members.len())).big_heading_plain()); diff --git a/game/src/info/building.rs b/game/src/info/building.rs index f4f8339701..70c6bfd868 100644 --- a/game/src/info/building.rs +++ b/game/src/info/building.rs @@ -45,12 +45,14 @@ pub fn info(ctx: &mut EventCtx, app: &App, details: &mut Details, id: BuildingID if !b.amenities.is_empty() { txt.add(Line("")); - if b.amenities.len() > 1 { + if b.amenities.len() == 1 { + txt.add(Line("1 amenity:")); + } else { txt.add(Line(format!("{} amenities:", b.amenities.len()))); } for (names, amenity) in &b.amenities { txt.add(Line(format!( - "- {} ({})", + " {} ({})", names.get(app.opts.language.as_ref()), amenity ))); diff --git a/game/src/info/person.rs b/game/src/info/person.rs index 827a6a34dd..f035eb532e 100644 --- a/game/src/info/person.rs +++ b/game/src/info/person.rs @@ -362,7 +362,7 @@ pub fn schedule( }; rows.push( Text::from(Line(format!( - "- Spends {} at {}", + " Spends {} at {}", trip.departure - last_t, at ))) @@ -391,7 +391,7 @@ pub fn schedule( }; rows.push( Text::from(Line(format!( - "- Spends {} at {}", + " Spends {} at {}", app.primary.sim.get_end_of_day() - last_trip.departure, at )))