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

Rename {Text,TextSpan}::draw to into_widget, for consistency. #253

Browse Source
This commit is contained in:
Dustin Carlino 2021-03-09 09:59:30 -08:00
parent a4a20ce1e5
commit 65d7bc5c8e
84 changed files with 350 additions and 287 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fifteen_min/src/find_home.rs
View File

@ -22,7 +22,9 @@ impl FindHome {
pub fn new(ctx: &mut EventCtx, options: Options) -> Box<dyn State<App>> { pub fn new(ctx: &mut EventCtx, options: Options) -> Box<dyn State<App>> {
let panel = Panel::new(Widget::col(vec![ let panel = Panel::new(Widget::col(vec![
Widget::row(vec![ Widget::row(vec![
Line("Find your walkable home").small_heading().draw(ctx), Line("Find your walkable home")
.small_heading()
.into_widget(ctx),
ctx.style().btn_close_widget(ctx), ctx.style().btn_close_widget(ctx),
]), ]),
// TODO Adjust text to say bikeshed, or otherwise reflect the options chosen // TODO Adjust text to say bikeshed, or otherwise reflect the options chosen
@ -141,7 +143,7 @@ impl Results {
let panel = Panel::new(Widget::col(vec![ let panel = Panel::new(Widget::col(vec![
Line("Results for your walkable home") Line("Results for your walkable home")
.small_heading() .small_heading()
.draw(ctx), .into_widget(ctx),
// TODO Adjust text to say bikeshed, or otherwise reflect the options chosen // TODO Adjust text to say bikeshed, or otherwise reflect the options chosen
"Here are all of the matching houses.".text_widget(ctx), "Here are all of the matching houses.".text_widget(ctx),
format!( format!(

12
fifteen_min/src/viewer.rs
View File

@ -280,7 +280,7 @@ fn build_panel(ctx: &mut EventCtx, app: &App, start: &Building, isochrone: &Isoc
rows.push( rows.push(
Line("15-minute neighborhood explorer") Line("15-minute neighborhood explorer")
.small_heading() .small_heading()
.draw(ctx), .into_widget(ctx),
); );
rows.push( rows.push(
@ -298,7 +298,7 @@ fn build_panel(ctx: &mut EventCtx, app: &App, start: &Building, isochrone: &Isoc
Line("Starting from: ").secondary(), Line("Starting from: ").secondary(),
Line(&start.address), Line(&start.address),
]) ])
.draw(ctx), .into_widget(ctx),
); );
rows.push( rows.push(
@ -306,7 +306,7 @@ fn build_panel(ctx: &mut EventCtx, app: &App, start: &Building, isochrone: &Isoc
Line("Estimated population: ").secondary(), Line("Estimated population: ").secondary(),
Line(prettyprint_usize(isochrone.population)), Line(prettyprint_usize(isochrone.population)),
]) ])
.draw(ctx), .into_widget(ctx),
); );
rows.push( rows.push(
@ -314,7 +314,7 @@ fn build_panel(ctx: &mut EventCtx, app: &App, start: &Building, isochrone: &Isoc
Line("Estimated street parking spots: ").secondary(), Line("Estimated street parking spots: ").secondary(),
Line(prettyprint_usize(isochrone.onstreet_parking_spots)), Line(prettyprint_usize(isochrone.onstreet_parking_spots)),
]) ])
.draw(ctx), .into_widget(ctx),
); );
rows.push(ColorLegend::categories( rows.push(ColorLegend::categories(
@ -488,7 +488,7 @@ impl ExploreAmenities {
Widget::row(vec![ Widget::row(vec![
Line(format!("{} within 15 minutes", category)) Line(format!("{} within 15 minutes", category))
.small_heading() .small_heading()
.draw(ctx), .into_widget(ctx),
ctx.style().btn_close_widget(ctx), ctx.style().btn_close_widget(ctx),
]), ]),
table.render(ctx, app), table.render(ctx, app),
@ -509,7 +509,7 @@ impl ExploreAmenities {
Widget::row(vec![ Widget::row(vec![
Line(format!("{} within 15 minutes", self.category)) Line(format!("{} within 15 minutes", self.category))
.small_heading() .small_heading()
.draw(ctx), .into_widget(ctx),
ctx.style().btn_close_widget(ctx), ctx.style().btn_close_widget(ctx),
]), ]),
self.table.render(ctx, app), self.table.render(ctx, app),

20
game/src/challenges/cutscene.rs
View File

@ -179,7 +179,11 @@ fn make_panel(
.autocrop() .autocrop()
.into_widget(ctx), .into_widget(ctx),
Widget::custom_row(vec![ Widget::custom_row(vec![
scenes[idx].msg.clone().wrap_to_pct(ctx, 30).draw(ctx), scenes[idx]
.msg
.clone()
.wrap_to_pct(ctx, 30)
.into_widget(ctx),
Image::untinted("system/assets/characters/player.svg").into_widget(ctx), Image::untinted("system/assets/characters/player.svg").into_widget(ctx),
]) ])
.align_right(), .align_right(),
@ -189,7 +193,11 @@ fn make_panel(
.scale(0.75) .scale(0.75)
.autocrop() .autocrop()
.into_widget(ctx), .into_widget(ctx),
scenes[idx].msg.clone().wrap_to_pct(ctx, 30).draw(ctx), scenes[idx]
.msg
.clone()
.wrap_to_pct(ctx, 30)
.into_widget(ctx),
Image::untinted("system/assets/characters/player.svg") Image::untinted("system/assets/characters/player.svg")
.into_widget(ctx) .into_widget(ctx)
.align_right(), .align_right(),
@ -207,7 +215,11 @@ fn make_panel(
.scale(scale) .scale(scale)
.autocrop() .autocrop()
.into_widget(ctx), .into_widget(ctx),
scenes[idx].msg.clone().wrap_to_pct(ctx, 30).draw(ctx), scenes[idx]
.msg
.clone()
.wrap_to_pct(ctx, 30)
.into_widget(ctx),
]), ]),
Image::untinted("system/assets/characters/player.svg").into_widget(ctx), Image::untinted("system/assets/characters/player.svg").into_widget(ctx),
]) ])
@ -232,7 +244,7 @@ fn make_panel(
.btn_back("Home") .btn_back("Home")
.build_widget(ctx, "quit") .build_widget(ctx, "quit")
.margin_right(100), .margin_right(100),
Line(name).big_heading_styled().draw(ctx), Line(name).big_heading_styled().into_widget(ctx),
]) ])
.margin_below(40), .margin_below(40),
inner inner

6
game/src/challenges/mod.rs
View File

@ -140,7 +140,7 @@ impl ChallengesPicker {
Line("A/B STREET").display_title(), Line("A/B STREET").display_title(),
Line("CHALLENGES").big_heading_styled(), Line("CHALLENGES").big_heading_styled(),
]) ])
.draw(ctx) .into_widget(ctx)
.centered_horiz(), .centered_horiz(),
ctx.style() ctx.style()
.btn_outline .btn_outline
@ -215,7 +215,7 @@ impl ChallengesPicker {
} }
let mut inner_col = vec![ let mut inner_col = vec![
txt.draw(ctx), txt.into_widget(ctx),
ctx.style() ctx.style()
.btn_outline .btn_outline
.text("Start!") .text("Start!")
@ -234,7 +234,7 @@ impl ChallengesPicker {
))); )));
idx += 1; idx += 1;
} }
inner_col.push(txt.draw(ctx)); inner_col.push(txt.into_widget(ctx));
} else { } else {
inner_col.push("No attempts yet".text_widget(ctx)); inner_col.push("No attempts yet".text_widget(ctx));
} }

8
game/src/common/warp.rs
View File

@ -74,7 +74,9 @@ impl DebugWarp {
Box::new(DebugWarp { Box::new(DebugWarp {
panel: Panel::new(Widget::col(vec![ panel: Panel::new(Widget::col(vec![
Widget::row(vec![ Widget::row(vec![
Line("Warp to an object by ID").small_heading().draw(ctx), Line("Warp to an object by ID")
.small_heading()
.into_widget(ctx),
ctx.style().btn_close_widget(ctx), ctx.style().btn_close_widget(ctx),
]), ]),
"Example: r42 is Road #42".text_widget(ctx), "Example: r42 is Road #42".text_widget(ctx),
@ -108,13 +110,13 @@ impl DebugWarp {
Line("L").fg(c), Line("L").fg(c),
Line("ot"), Line("ot"),
]) ])
.draw(ctx), .into_widget(ctx),
Text::from_all(vec![ Text::from_all(vec![
Line("Or "), Line("Or "),
Line("j").fg(c), Line("j").fg(c),
Line("ump to the previous position"), Line("ump to the previous position"),
]) ])
.draw(ctx), .into_widget(ctx),
Widget::text_entry(ctx, String::new(), true).named("input"), Widget::text_entry(ctx, String::new(), true).named("input"),
ctx.style() ctx.style()
.btn_outline .btn_outline

4
game/src/debug/blocked_by.rs
View File

@ -39,11 +39,11 @@ impl Viewer {
Widget::row(vec![ Widget::row(vec![
Line("What agents are blocked by others?") Line("What agents are blocked by others?")
.small_heading() .small_heading()
.draw(ctx), .into_widget(ctx),
ctx.style().btn_close_widget(ctx), ctx.style().btn_close_widget(ctx),
]), ]),
Text::from(Line("Root causes")) Text::from(Line("Root causes"))
.draw(ctx) .into_widget(ctx)
.named("root causes"), .named("root causes"),
])) ]))
.aligned(HorizontalAlignment::Center, VerticalAlignment::Top) .aligned(HorizontalAlignment::Center, VerticalAlignment::Top)

2
game/src/debug/floodfill.rs
View File

@ -51,7 +51,7 @@ impl Floodfiller {
Box::new(Floodfiller { Box::new(Floodfiller {
panel: Panel::new(Widget::col(vec![ panel: Panel::new(Widget::col(vec![
Widget::row(vec![ Widget::row(vec![
Line(title).small_heading().draw(ctx), Line(title).small_heading().into_widget(ctx),
ctx.style().btn_close_widget(ctx), ctx.style().btn_close_widget(ctx),
]), ]),
format!("{} unreachable lanes", num_unreachable).text_widget(ctx), format!("{} unreachable lanes", num_unreachable).text_widget(ctx),

9
game/src/debug/mod.rs
View File

@ -52,10 +52,10 @@ impl DebugMode {
Box::new(DebugMode { Box::new(DebugMode {
panel: Panel::new(Widget::col(vec![ panel: Panel::new(Widget::col(vec![
Widget::row(vec![ Widget::row(vec![
Line("Debug Mode").small_heading().draw(ctx), Line("Debug Mode").small_heading().into_widget(ctx),
ctx.style().btn_close_widget(ctx), ctx.style().btn_close_widget(ctx),
]), ]),
Text::new().draw(ctx).named("current info"), Text::new().into_widget(ctx).named("current info"),
Toggle::switch(ctx, "show buildings", Key::Num1, true), Toggle::switch(ctx, "show buildings", Key::Num1, true),
Toggle::switch(ctx, "show intersections", Key::Num2, true), Toggle::switch(ctx, "show intersections", Key::Num2, true),
Toggle::switch(ctx, "show lanes", Key::Num3, true), Toggle::switch(ctx, "show lanes", Key::Num3, true),
@ -139,7 +139,7 @@ impl DebugMode {
Key::LeftControl.txt(ctx), Key::LeftControl.txt(ctx),
Line(" to show position"), Line(" to show position"),
]) ])
.draw(ctx), .into_widget(ctx),
])) ]))
.aligned(HorizontalAlignment::Right, VerticalAlignment::Top) .aligned(HorizontalAlignment::Right, VerticalAlignment::Top)
.build(ctx), .build(ctx),
@ -171,7 +171,8 @@ impl DebugMode {
abstutil::prettyprint_usize(n) abstutil::prettyprint_usize(n)
))); )));
} }
self.panel.replace(ctx, "current info", txt.draw(ctx)); self.panel
.replace(ctx, "current info", txt.into_widget(ctx));
} }
} }

2
game/src/debug/path_counter.rs
View File

@ -67,7 +67,7 @@ impl PathCounter {
Widget::row(vec![ Widget::row(vec![
Line(format!("Paths across {}", i)) Line(format!("Paths across {}", i))
.small_heading() .small_heading()
.draw(ctx), .into_widget(ctx),
ctx.style().btn_close_widget(ctx), ctx.style().btn_close_widget(ctx),
]), ]),
ColorLegend::gradient( ColorLegend::gradient(

2
game/src/debug/polygons.rs
View File

@ -35,7 +35,7 @@ impl PolygonDebugger {
Box::new(PolygonDebugger { Box::new(PolygonDebugger {
panel: Panel::new(Widget::col(vec![ panel: Panel::new(Widget::col(vec![
Widget::row(vec![ Widget::row(vec![
Line("Geometry debugger").small_heading().draw(ctx), Line("Geometry debugger").small_heading().into_widget(ctx),
ctx.style().btn_close_widget(ctx), ctx.style().btn_close_widget(ctx),
]), ]),
Widget::row(vec![ Widget::row(vec![

4
game/src/debug/routes.rs
View File

@ -27,7 +27,7 @@ impl RouteExplorer {
goal: None, goal: None,
panel: Panel::new(Widget::col(vec![ panel: Panel::new(Widget::col(vec![
Widget::row(vec![ Widget::row(vec![
Line("Route explorer").small_heading().draw(ctx), Line("Route explorer").small_heading().into_widget(ctx),
ctx.style().btn_close_widget(ctx), ctx.style().btn_close_widget(ctx),
]), ]),
ctx.style() ctx.style()
@ -288,7 +288,7 @@ impl AllRoutesExplorer {
Box::new(AllRoutesExplorer { Box::new(AllRoutesExplorer {
panel: Panel::new(Widget::col(vec![ panel: Panel::new(Widget::col(vec![
Widget::row(vec![ Widget::row(vec![
Line("All routes explorer").small_heading().draw(ctx), Line("All routes explorer").small_heading().into_widget(ctx),
ctx.style().btn_close_widget(ctx), ctx.style().btn_close_widget(ctx),
]), ]),
format!("{} total requests", prettyprint_usize(requests.len())).text_widget(ctx), format!("{} total requests", prettyprint_usize(requests.len())).text_widget(ctx),

6
game/src/debug/uber_turns.rs
View File

@ -31,7 +31,7 @@ impl UberTurnPicker {
Widget::row(vec![ Widget::row(vec![
Line("Select multiple intersections") Line("Select multiple intersections")
.small_heading() .small_heading()
.draw(ctx), .into_widget(ctx),
ctx.style().btn_close_widget(ctx), ctx.style().btn_close_widget(ctx),
]), ]),
ctx.style() ctx.style()
@ -174,7 +174,7 @@ impl UberTurnViewer {
let panel = Panel::new(Widget::col(vec![ let panel = Panel::new(Widget::col(vec![
Widget::row(vec![ Widget::row(vec![
Line("Uber-turn viewer").small_heading().draw(ctx), Line("Uber-turn viewer").small_heading().into_widget(ctx),
Widget::vert_separator(ctx, 50.0), Widget::vert_separator(ctx, 50.0),
ctx.style() ctx.style()
.btn_prev() .btn_prev()
@ -182,7 +182,7 @@ impl UberTurnViewer {
.hotkey(Key::LeftArrow) .hotkey(Key::LeftArrow)
.build_widget(ctx, "previous uber-turn"), .build_widget(ctx, "previous uber-turn"),
Text::from(Line(format!("{}/{}", idx + 1, ic.uber_turns.len())).secondary()) Text::from(Line(format!("{}/{}", idx + 1, ic.uber_turns.len())).secondary())
.draw(ctx) .into_widget(ctx)
.centered_vert(), .centered_vert(),
ctx.style() ctx.style()
.btn_next() .btn_next()

2
game/src/devtools/collisions.rs
View File

@ -38,7 +38,7 @@ impl CollisionsViewer {
Box::new(CollisionsViewer { Box::new(CollisionsViewer {
panel: Panel::new(Widget::col(vec![ panel: Panel::new(Widget::col(vec![
Widget::row(vec![ Widget::row(vec![
Line("Collisions viewer").small_heading().draw(ctx), Line("Collisions viewer").small_heading().into_widget(ctx),
ctx.style().btn_close_widget(ctx), ctx.style().btn_close_widget(ctx),
]), ]),
format!("{} collisions", prettyprint_usize(count)) format!("{} collisions", prettyprint_usize(count))

6
game/src/devtools/destinations.rs
View File

@ -94,12 +94,14 @@ impl PopularDestinations {
draw: ctx.upload(batch), draw: ctx.upload(batch),
panel: Panel::new(Widget::col(vec![ panel: Panel::new(Widget::col(vec![
Widget::row(vec![ Widget::row(vec![
Line("Most popular destinations").small_heading().draw(ctx), Line("Most popular destinations")
.small_heading()
.into_widget(ctx),
ctx.style().btn_close_widget(ctx), ctx.style().btn_close_widget(ctx),
]), ]),
Toggle::switch(ctx, "Show heatmap", None, opts.is_some()), Toggle::switch(ctx, "Show heatmap", None, opts.is_some()),
controls, controls,
breakdown.draw(ctx), breakdown.into_widget(ctx),
])) ]))
.aligned(HorizontalAlignment::Right, VerticalAlignment::Top) .aligned(HorizontalAlignment::Right, VerticalAlignment::Top)
.build(ctx), .build(ctx),

2
game/src/devtools/kml.rs
View File

@ -69,7 +69,7 @@ impl ViewKML {
draw: ctx.upload(batch), draw: ctx.upload(batch),
panel: Panel::new(Widget::col(vec![ panel: Panel::new(Widget::col(vec![
Widget::row(vec![ Widget::row(vec![
Line("KML viewer").small_heading().draw(ctx), Line("KML viewer").small_heading().into_widget(ctx),
ctx.style().btn_close_widget(ctx), ctx.style().btn_close_widget(ctx),
]), ]),
format!( format!(

2
game/src/devtools/mod.rs
View File

@ -31,7 +31,7 @@ impl DevToolsMode {
Box::new(DevToolsMode { Box::new(DevToolsMode {
panel: Panel::new(Widget::col(vec![ panel: Panel::new(Widget::col(vec![
Widget::row(vec![ Widget::row(vec![
Line("Internal dev tools").small_heading().draw(ctx), Line("Internal dev tools").small_heading().into_widget(ctx),
ctx.style().btn_close_widget(ctx), ctx.style().btn_close_widget(ctx),
]), ]),
Widget::row(vec![ Widget::row(vec![

2
game/src/devtools/polygon.rs
View File

@ -29,7 +29,7 @@ impl PolygonEditor {
Box::new(PolygonEditor { Box::new(PolygonEditor {
panel: Panel::new(Widget::col(vec![ panel: Panel::new(Widget::col(vec![
Widget::row(vec![ Widget::row(vec![
Line("Polygon editor").small_heading().draw(ctx), Line("Polygon editor").small_heading().into_widget(ctx),
ctx.style().btn_close_widget(ctx), ctx.style().btn_close_widget(ctx),
]), ]),
ctx.style() ctx.style()

4
game/src/devtools/scenario.rs
View File

@ -51,7 +51,7 @@ impl ScenarioManager {
Widget::row(vec![ Widget::row(vec![
Line(format!("Scenario {}", scenario.scenario_name)) Line(format!("Scenario {}", scenario.scenario_name))
.small_heading() .small_heading()
.draw(ctx), .into_widget(ctx),
ctx.style().btn_close_widget(ctx), ctx.style().btn_close_widget(ctx),
]), ]),
ctx.style() ctx.style()
@ -75,7 +75,7 @@ impl ScenarioManager {
Line(""), Line(""),
Line("Parked cars per building"), Line("Parked cars per building"),
]) ])
.draw(ctx), .into_widget(ctx),
legend, legend,
])) ]))
.aligned(HorizontalAlignment::Right, VerticalAlignment::Top) .aligned(HorizontalAlignment::Right, VerticalAlignment::Top)

4
game/src/devtools/story.rs
View File

@ -310,7 +310,7 @@ impl State<App> for StoryMapEditor {
fn make_panel(ctx: &mut EventCtx, story: &StoryMap, mode: &Mode, dirty: bool) -> Panel { fn make_panel(ctx: &mut EventCtx, story: &StoryMap, mode: &Mode, dirty: bool) -> Panel {
Panel::new(Widget::col(vec![ Panel::new(Widget::col(vec![
Widget::row(vec![ Widget::row(vec![
Line("Story map editor").small_heading().draw(ctx), Line("Story map editor").small_heading().into_widget(ctx),
Widget::vert_separator(ctx, 30.0), Widget::vert_separator(ctx, 30.0),
ctx.style() ctx.style()
.btn_outline .btn_outline
@ -489,7 +489,7 @@ impl Marker {
fn make_editor(&self, ctx: &mut EventCtx) -> Panel { fn make_editor(&self, ctx: &mut EventCtx) -> Panel {
Panel::new(Widget::col(vec![ Panel::new(Widget::col(vec![
Widget::row(vec![ Widget::row(vec![
Line("Editing marker").small_heading().draw(ctx), Line("Editing marker").small_heading().into_widget(ctx),
ctx.style().btn_close_widget(ctx), ctx.style().btn_close_widget(ctx),
]), ]),
ctx.style().btn_outline.text("delete").build_def(ctx), ctx.style().btn_outline.text("delete").build_def(ctx),

4
game/src/edit/bulk.rs
View File

@ -29,7 +29,7 @@ impl BulkSelect {
fn make_select_panel(ctx: &mut EventCtx, selector: &RoadSelector) -> Panel { fn make_select_panel(ctx: &mut EventCtx, selector: &RoadSelector) -> Panel {
Panel::new(Widget::col(vec![ Panel::new(Widget::col(vec![
Line("Edit many roads").small_heading().draw(ctx), Line("Edit many roads").small_heading().into_widget(ctx),
selector.make_controls(ctx), selector.make_controls(ctx),
Widget::row(vec![ Widget::row(vec![
ctx.style() ctx.style()
@ -158,7 +158,7 @@ impl BulkEdit {
panel: Panel::new(Widget::col(vec![ panel: Panel::new(Widget::col(vec![
Line(format!("Editing {} roads", roads.len())) Line(format!("Editing {} roads", roads.len()))
.small_heading() .small_heading()
.draw(ctx), .into_widget(ctx),
"Lane types".text_widget(ctx), "Lane types".text_widget(ctx),
make_lt_switcher(ctx, vec![(None, None)]).named("lt transformations"), make_lt_switcher(ctx, vec![(None, None)]).named("lt transformations"),
{ {

4
game/src/edit/lanes.rs
View File

@ -69,7 +69,9 @@ impl LaneEditor {
let parent = app.primary.map.get_parent(l); let parent = app.primary.map.get_parent(l);
let col = vec![ let col = vec![
Widget::row(vec![ Widget::row(vec![
Line(format!("Editing {}", l)).small_heading().draw(ctx), Line(format!("Editing {}", l))
.small_heading()
.into_widget(ctx),
ctx.style() ctx.style()
.btn_plain .btn_plain
.text("+ Edit multiple") .text("+ Edit multiple")

22
game/src/edit/mod.rs
View File

@ -394,14 +394,14 @@ impl SaveEdits {
let mut save = SaveEdits { let mut save = SaveEdits {
current_name: initial_name.clone(), current_name: initial_name.clone(),
panel: Panel::new(Widget::col(vec![ panel: Panel::new(Widget::col(vec![
Line(title).small_heading().draw(ctx), Line(title).small_heading().into_widget(ctx),
Widget::row(vec![ Widget::row(vec![
"Name:".text_widget(ctx).centered_vert(), "Name:".text_widget(ctx).centered_vert(),
Widget::text_entry(ctx, initial_name, true).named("filename"), Widget::text_entry(ctx, initial_name, true).named("filename"),
]), ]),
// TODO Want this to always consistently be one line high, but it isn't for a blank // TODO Want this to always consistently be one line high, but it isn't for a blank
// line // line
Text::new().draw(ctx).named("warning"), Text::new().into_widget(ctx).named("warning"),
Widget::row(vec![ Widget::row(vec![
if discard { if discard {
ctx.style() ctx.style()
@ -448,7 +448,8 @@ impl SaveEdits {
.disabled(true) .disabled(true)
.build_def(ctx), .build_def(ctx),
); );
self.panel.replace(ctx, "warning", Text::new().draw(ctx)); self.panel
.replace(ctx, "warning", Text::new().into_widget(ctx));
} else if abstio::file_exists(abstio::path_edits( } else if abstio::file_exists(abstio::path_edits(
app.primary.map.get_name(), app.primary.map.get_name(),
&self.current_name, &self.current_name,
@ -467,7 +468,7 @@ impl SaveEdits {
"warning", "warning",
Line("A proposal with this name already exists") Line("A proposal with this name already exists")
.fg(Color::hex("#FF5E5E")) .fg(Color::hex("#FF5E5E"))
.draw(ctx), .into_widget(ctx),
); );
} else { } else {
self.panel.replace( self.panel.replace(
@ -479,7 +480,8 @@ impl SaveEdits {
.hotkey(Key::Enter) .hotkey(Key::Enter)
.build_def(ctx), .build_def(ctx),
); );
self.panel.replace(ctx, "warning", Text::new().draw(ctx)); self.panel
.replace(ctx, "warning", Text::new().into_widget(ctx));
} }
} }
} }
@ -534,7 +536,7 @@ impl LoadEdits {
fn new(ctx: &mut EventCtx, app: &App, mode: GameplayMode) -> Box<dyn State<App>> { fn new(ctx: &mut EventCtx, app: &App, mode: GameplayMode) -> Box<dyn State<App>> {
let current_edits_name = &app.primary.map.get_edits().edits_name; let current_edits_name = &app.primary.map.get_edits().edits_name;
let your_edits = vec![ let your_edits = vec![
Line("Your proposals").small_heading().draw(ctx), Line("Your proposals").small_heading().into_widget(ctx),
Menu::widget( Menu::widget(
ctx, ctx,
abstio::list_all_objects(abstio::path_all_edits(app.primary.map.get_name())) abstio::list_all_objects(abstio::path_all_edits(app.primary.map.get_name()))
@ -545,7 +547,7 @@ impl LoadEdits {
]; ];
// widgetry can't toggle keyboard focus between two menus, so just use buttons for the less // widgetry can't toggle keyboard focus between two menus, so just use buttons for the less
// common use case. // common use case.
let mut proposals = vec![Line("Community proposals").small_heading().draw(ctx)]; let mut proposals = vec![Line("Community proposals").small_heading().into_widget(ctx)];
// Up-front filter out proposals that definitely don't fit the current map // Up-front filter out proposals that definitely don't fit the current map
for name in abstio::list_all_objects(abstio::path("system/proposals")) { for name in abstio::list_all_objects(abstio::path("system/proposals")) {
let path = abstio::path(format!("system/proposals/{}.json", name)); let path = abstio::path(format!("system/proposals/{}.json", name));
@ -558,7 +560,7 @@ impl LoadEdits {
mode, mode,
panel: Panel::new(Widget::col(vec![ panel: Panel::new(Widget::col(vec![
Widget::row(vec![ Widget::row(vec![
Line("Load proposal").small_heading().draw(ctx), Line("Load proposal").small_heading().into_widget(ctx),
ctx.style().btn_close_widget(ctx), ctx.style().btn_close_widget(ctx),
]), ]),
ctx.style() ctx.style()
@ -652,7 +654,7 @@ fn make_topcenter(ctx: &mut EventCtx, app: &App) -> Panel {
Panel::new(Widget::col(vec![ Panel::new(Widget::col(vec![
Line("Editing map") Line("Editing map")
.small_heading() .small_heading()
.draw(ctx) .into_widget(ctx)
.centered_horiz(), .centered_horiz(),
ctx.style() ctx.style()
.btn_solid_primary .btn_solid_primary
@ -868,7 +870,7 @@ impl ConfirmDiscard {
.into_widget(ctx) .into_widget(ctx)
.container() .container()
.padding_top(6), .padding_top(6),
Line("Alert").small_heading().draw(ctx), Line("Alert").small_heading().into_widget(ctx),
ctx.style().btn_close_widget(ctx), ctx.style().btn_close_widget(ctx),
]), ]),
"Are you sure you want to discard changes you made?".text_widget(ctx), "Are you sure you want to discard changes you made?".text_widget(ctx),

4
game/src/edit/routes.rs
View File

@ -22,10 +22,10 @@ impl RouteEditor {
Box::new(RouteEditor { Box::new(RouteEditor {
panel: Panel::new(Widget::col(vec![ panel: Panel::new(Widget::col(vec![
Widget::row(vec![ Widget::row(vec![
Line("Route editor").small_heading().draw(ctx), Line("Route editor").small_heading().into_widget(ctx),
ctx.style().btn_close_widget(ctx), ctx.style().btn_close_widget(ctx),
]), ]),
Line(&route.full_name).draw(ctx), Line(&route.full_name).into_widget(ctx),
// TODO This UI needs design, just something to start plumbing the edits // TODO This UI needs design, just something to start plumbing the edits
Widget::row(vec![ Widget::row(vec![
"Frequency in minutes".text_widget(ctx), "Frequency in minutes".text_widget(ctx),

2
game/src/edit/stop_signs.rs
View File

@ -50,7 +50,7 @@ impl StopSignEditor {
.collect(); .collect();
let panel = Panel::new(Widget::col(vec![ let panel = Panel::new(Widget::col(vec![
Line("Stop sign editor").small_heading().draw(ctx), Line("Stop sign editor").small_heading().into_widget(ctx),
ctx.style() ctx.style()
.btn_outline .btn_outline
.text("reset to default") .text("reset to default")

8
game/src/edit/traffic_signals/edits.rs
View File

@ -27,7 +27,7 @@ impl ChangeDuration {
Widget::row(vec![ Widget::row(vec![
Line("How long should this stage last?") Line("How long should this stage last?")
.small_heading() .small_heading()
.draw(ctx), .into_widget(ctx),
ctx.style().btn_close_widget(ctx), ctx.style().btn_close_widget(ctx),
]), ]),
Widget::row(vec![ Widget::row(vec![
@ -61,7 +61,7 @@ impl ChangeDuration {
]), ]),
Widget::row(vec![Line("Additional time this stage can last?") Widget::row(vec![Line("Additional time this stage can last?")
.small_heading() .small_heading()
.draw(ctx)]), .into_widget(ctx)]),
Widget::row(vec![ Widget::row(vec![
"Seconds:".text_widget(ctx).centered_vert(), "Seconds:".text_widget(ctx).centered_vert(),
Spinner::widget( Spinner::widget(
@ -78,7 +78,7 @@ impl ChangeDuration {
]), ]),
Widget::row(vec![Line("How long with no demand to end stage?") Widget::row(vec![Line("How long with no demand to end stage?")
.small_heading() .small_heading()
.draw(ctx)]), .into_widget(ctx)]),
Widget::row(vec![ Widget::row(vec![
"Seconds:".text_widget(ctx).centered_vert(), "Seconds:".text_widget(ctx).centered_vert(),
Spinner::widget( Spinner::widget(
@ -93,7 +93,7 @@ impl ChangeDuration {
]), ]),
Line("Minimum time is set by the time required for crosswalk") Line("Minimum time is set by the time required for crosswalk")
.secondary() .secondary()
.draw(ctx), .into_widget(ctx),
ctx.style() ctx.style()
.btn_solid_primary .btn_solid_primary
.text("Apply") .text("Apply")

6
game/src/edit/traffic_signals/mod.rs
View File

@ -525,7 +525,9 @@ fn make_top_panel(ctx: &mut EventCtx, app: &App, can_undo: bool, can_redo: bool)
]; ];
Panel::new(Widget::col(vec![ Panel::new(Widget::col(vec![
Widget::row(vec![ Widget::row(vec![
Line("Traffic signal editor").small_heading().draw(ctx), Line("Traffic signal editor")
.small_heading()
.into_widget(ctx),
ctx.style() ctx.style()
.btn_plain .btn_plain
.text("+ Edit multiple") .text("+ Edit multiple")
@ -595,7 +597,7 @@ fn make_side_panel(
.secondary(), .secondary(),
); );
} }
let mut col = vec![txt.draw(ctx)]; let mut col = vec![txt.into_widget(ctx)];
col.push(Widget::horiz_separator(ctx, 0.2)); col.push(Widget::horiz_separator(ctx, 0.2));
// TODO Say "normally" to account for variable stages? // TODO Say "normally" to account for variable stages?

8
game/src/edit/traffic_signals/offsets.rs
View File

@ -47,7 +47,7 @@ impl ShowAbsolute {
Widget::row(vec![ Widget::row(vec![
Line(format!("Tuning offset for {} signals", members.len())) Line(format!("Tuning offset for {} signals", members.len()))
.small_heading() .small_heading()
.draw(ctx), .into_widget(ctx),
ctx.style().btn_close_widget(ctx), ctx.style().btn_close_widget(ctx),
]), ]),
"Select an intersection as the base".text_widget(ctx), "Select an intersection as the base".text_widget(ctx),
@ -136,7 +136,7 @@ impl ShowRelative {
Widget::row(vec![ Widget::row(vec![
Line(format!("Tuning offset for {} signals", members.len())) Line(format!("Tuning offset for {} signals", members.len()))
.small_heading() .small_heading()
.draw(ctx), .into_widget(ctx),
ctx.style().btn_close_widget(ctx), ctx.style().btn_close_widget(ctx),
]), ]),
"Select a second intersection to tune offset between the two".text_widget(ctx), "Select a second intersection to tune offset between the two".text_widget(ctx),
@ -228,7 +228,7 @@ impl TuneRelative {
Widget::row(vec![ Widget::row(vec![
Line(format!("Tuning offset between {} and {}", i1, i2)) Line(format!("Tuning offset between {} and {}", i1, i2))
.small_heading() .small_heading()
.draw(ctx), .into_widget(ctx),
ctx.style().btn_close_widget(ctx), ctx.style().btn_close_widget(ctx),
]), ]),
Text::from_multiline(vec![ Text::from_multiline(vec![
@ -246,7 +246,7 @@ impl TuneRelative {
dist_btwn / Scenario::max_ped_speed() dist_btwn / Scenario::max_ped_speed()
)), )),
]) ])
.draw(ctx), .into_widget(ctx),
Widget::row(vec![ Widget::row(vec![
"Offset (seconds):".text_widget(ctx), "Offset (seconds):".text_widget(ctx),
Spinner::widget(ctx, (0, 90), (offset2 - offset1).inner_seconds() as isize) Spinner::widget(ctx, (0, 90), (offset2 - offset1).inner_seconds() as isize)

2
game/src/edit/traffic_signals/picker.rs
View File

@ -30,7 +30,7 @@ impl SignalPicker {
Widget::row(vec![ Widget::row(vec![
Line("Select multiple traffic signals") Line("Select multiple traffic signals")
.small_heading() .small_heading()
.draw(ctx), .into_widget(ctx),
ctx.style().btn_close_widget(ctx), ctx.style().btn_close_widget(ctx),
]), ]),
make_btn(ctx, members.len()), make_btn(ctx, members.len()),

6
game/src/edit/zones.rs
View File

@ -51,7 +51,7 @@ impl ZoneEditor {
panel: Panel::new(Widget::col(vec![ panel: Panel::new(Widget::col(vec![
Line("Editing restricted access zone") Line("Editing restricted access zone")
.small_heading() .small_heading()
.draw(ctx), .into_widget(ctx),
selector.make_controls(ctx).named("selector"), selector.make_controls(ctx).named("selector"),
legend, legend,
make_instructions(ctx, &allow_through_traffic).named("instructions"), make_instructions(ctx, &allow_through_traffic).named("instructions"),
@ -224,9 +224,9 @@ fn make_instructions(ctx: &mut EventCtx, allow_through_traffic: &BTreeSet<TripMo
Would you like to restrict it?", Would you like to restrict it?",
)) ))
.wrap_to_pct(ctx, 30) .wrap_to_pct(ctx, 30)
.draw(ctx) .into_widget(ctx)
} else { } else {
Line("Trips may start or end in this zone, but through-traffic is only allowed for:") Line("Trips may start or end in this zone, but through-traffic is only allowed for:")
.draw(ctx) .into_widget(ctx)
} }
} }

4
game/src/info/building.rs
View File

@ -102,7 +102,7 @@ pub fn info(ctx: &mut EventCtx, app: &App, details: &mut Details, id: BuildingID
} }
if !txt.is_empty() { if !txt.is_empty() {
rows.push(txt.draw(ctx)) rows.push(txt.into_widget(ctx))
} }
if app.opts.dev { if app.opts.dev {
@ -233,7 +233,7 @@ fn header(
let mut rows = vec![]; let mut rows = vec![];
rows.push(Widget::row(vec![ rows.push(Widget::row(vec![
Line(id.to_string()).small_heading().draw(ctx), Line(id.to_string()).small_heading().into_widget(ctx),
header_btns(ctx), header_btns(ctx),
])); ]));

22
game/src/info/bus.rs
View File

@ -16,10 +16,10 @@ pub fn stop(ctx: &mut EventCtx, app: &App, details: &mut Details, id: BusStopID)
let sim = &app.primary.sim; let sim = &app.primary.sim;
rows.push(Widget::row(vec![ rows.push(Widget::row(vec![
Line("Bus stop").small_heading().draw(ctx), Line("Bus stop").small_heading().into_widget(ctx),
header_btns(ctx), header_btns(ctx),
])); ]));
rows.push(Line(&bs.name).draw(ctx)); rows.push(Line(&bs.name).into_widget(ctx));
let all_arrivals = &sim.get_analytics().bus_arrivals; let all_arrivals = &sim.get_analytics().bus_arrivals;
for r in app.primary.map.get_routes_serving_stop(id) { for r in app.primary.map.get_routes_serving_stop(id) {
@ -45,7 +45,7 @@ pub fn stop(ctx: &mut EventCtx, app: &App, details: &mut Details, id: BusStopID)
} else { } else {
txt.add(Line(" No arrivals yet").secondary()); txt.add(Line(" No arrivals yet").secondary());
} }
rows.push(txt.draw(ctx)); rows.push(txt.into_widget(ctx));
} }
let mut boardings: Counter<BusRouteID> = Counter::new(); let mut boardings: Counter<BusRouteID> = Counter::new();
@ -87,7 +87,7 @@ pub fn stop(ctx: &mut EventCtx, app: &App, details: &mut Details, id: BusStopID)
.secondary(), .secondary(),
); );
} }
rows.push(txt.draw(ctx)); rows.push(txt.into_widget(ctx));
// Draw where the bus/train stops // Draw where the bus/train stops
details.zoomed.push( details.zoomed.push(
@ -122,7 +122,7 @@ pub fn bus_status(ctx: &mut EventCtx, app: &App, details: &mut Details, id: CarI
"Currently has {} passengers", "Currently has {} passengers",
app.primary.sim.num_transit_passengers(id), app.primary.sim.num_transit_passengers(id),
)) ))
.draw(ctx), .into_widget(ctx),
); );
rows rows
@ -153,7 +153,7 @@ fn bus_header(
app.primary.map.get_br(route).short_name app.primary.map.get_br(route).short_name
)) ))
.small_heading() .small_heading()
.draw(ctx), .into_widget(ctx),
header_btns(ctx), header_btns(ctx),
])); ]));
rows.push(make_tabs( rows.push(make_tabs(
@ -174,13 +174,13 @@ pub fn route(ctx: &mut EventCtx, app: &App, details: &mut Details, id: BusRouteI
rows.push(Widget::row(vec![ rows.push(Widget::row(vec![
Line(format!("Route {}", route.short_name)) Line(format!("Route {}", route.short_name))
.small_heading() .small_heading()
.draw(ctx), .into_widget(ctx),
header_btns(ctx), header_btns(ctx),
])); ]));
rows.push( rows.push(
Text::from(Line(&route.full_name)) Text::from(Line(&route.full_name))
.wrap_to_pct(ctx, 20) .wrap_to_pct(ctx, 20)
.draw(ctx), .into_widget(ctx),
); );
if app.opts.dev { if app.opts.dev {
@ -248,7 +248,7 @@ pub fn route(ctx: &mut EventCtx, app: &App, details: &mut Details, id: BusRouteI
)) ))
.secondary(), .secondary(),
]) ])
.draw(ctx), .into_widget(ctx),
); );
rows.push(format!("{} stops", route.stops.len()).text_widget(ctx)); rows.push(format!("{} stops", route.stops.len()).text_widget(ctx));
@ -282,7 +282,7 @@ pub fn route(ctx: &mut EventCtx, app: &App, details: &mut Details, id: BusRouteI
)) ))
.secondary(), .secondary(),
]) ])
.draw(ctx), .into_widget(ctx),
])); ]));
details.warpers.insert(name, ID::BusStop(bs.id)); details.warpers.insert(name, ID::BusStop(bs.id));
} }
@ -308,7 +308,7 @@ pub fn route(ctx: &mut EventCtx, app: &App, details: &mut Details, id: BusRouteI
.hotkey(Key::E) .hotkey(Key::E)
.build_widget(ctx, &format!("edit {}", route.id)), .build_widget(ctx, &format!("edit {}", route.id)),
); );
rows.push(describe_schedule(route).draw(ctx)); rows.push(describe_schedule(route).into_widget(ctx));
} }
// Draw the route, label stops, and show location of buses // Draw the route, label stops, and show location of buses

2
game/src/info/debug.rs
View File

@ -8,7 +8,7 @@ pub fn area(ctx: &EventCtx, app: &App, _: &mut Details, id: AreaID) -> Vec<Widge
let mut rows = vec![]; let mut rows = vec![];
rows.push(Widget::row(vec![ rows.push(Widget::row(vec![
Line(id.to_string()).small_heading().draw(ctx), Line(id.to_string()).small_heading().into_widget(ctx),
header_btns(ctx), header_btns(ctx),
])); ]));

16
game/src/info/intersection.rs
View File

@ -32,7 +32,7 @@ pub fn info(ctx: &EventCtx, app: &App, details: &mut Details, id: IntersectionID
for r in road_names { for r in road_names {
txt.add(Line(format!(" {}", r))); txt.add(Line(format!(" {}", r)));
} }
rows.push(txt.draw(ctx)); rows.push(txt.into_widget(ctx));
if app.opts.dev { if app.opts.dev {
rows.push( rows.push(
@ -73,7 +73,7 @@ pub fn traffic(
.total_for(id) .total_for(id)
) )
))); )));
rows.push(txt.draw(ctx)); rows.push(txt.into_widget(ctx));
rows.push(opts.to_controls(ctx, app)); rows.push(opts.to_controls(ctx, app));
@ -197,7 +197,7 @@ pub fn current_demand(
rows.push( rows.push(
Widget::col(vec![ Widget::col(vec![
txt.draw(ctx), txt.into_widget(ctx),
DrawWithTooltips::new( DrawWithTooltips::new(
ctx, ctx,
batch, batch,
@ -287,7 +287,7 @@ pub fn traffic_signal(
// TODO Say "normally" or something? // TODO Say "normally" or something?
txt.add(Line(format!("One cycle lasts {}", total))); txt.add(Line(format!("One cycle lasts {}", total)));
} }
rows.push(txt.draw(ctx)); rows.push(txt.into_widget(ctx));
} }
for (idx, stage) in signal.stages.iter().enumerate() { for (idx, stage) in signal.stages.iter().enumerate() {
@ -302,7 +302,7 @@ pub fn traffic_signal(
additional additional
)), )),
} }
.draw(ctx), .into_widget(ctx),
); );
{ {
@ -377,7 +377,9 @@ fn delay_plot(
disabled: opts.disabled_series(), disabled: opts.disabled_series(),
}; };
Widget::col(vec![ Widget::col(vec![
Line("Delay through intersection").small_heading().draw(ctx), Line("Delay through intersection")
.small_heading()
.into_widget(ctx),
if fan_chart { if fan_chart {
FanChart::new(ctx, series, plot_opts) FanChart::new(ctx, series, plot_opts)
} else { } else {
@ -407,7 +409,7 @@ fn header(
IntersectionType::Construction => format!("{} (under construction)", id), IntersectionType::Construction => format!("{} (under construction)", id),
}; };
rows.push(Widget::row(vec![ rows.push(Widget::row(vec![
Line(label).small_heading().draw(ctx), Line(label).small_heading().into_widget(ctx),
header_btns(ctx), header_btns(ctx),
])); ]));

10
game/src/info/lane.rs
View File

@ -80,7 +80,9 @@ pub fn info(ctx: &EventCtx, app: &App, details: &mut Details, id: LaneID) -> Vec
}); });
} }
let section = Widget::col(vec![ let section = Widget::col(vec![
Line("Parking spots available").small_heading().draw(ctx), Line("Parking spots available")
.small_heading()
.into_widget(ctx),
LinePlot::new( LinePlot::new(
ctx, ctx,
series, series,
@ -178,7 +180,7 @@ pub fn debug(ctx: &EventCtx, app: &App, details: &mut Details, id: LaneID) -> Ve
let mut txt = Text::from(Line("")); let mut txt = Text::from(Line(""));
txt.add(Line("Raw OpenStreetMap data")); txt.add(Line("Raw OpenStreetMap data"));
rows.push(txt.draw(ctx)); rows.push(txt.into_widget(ctx));
rows.extend(make_table( rows.extend(make_table(
ctx, ctx,
@ -210,7 +212,7 @@ pub fn traffic(
"Since midnight: {} commuters and vehicles crossed", "Since midnight: {} commuters and vehicles crossed",
prettyprint_usize(app.primary.sim.get_analytics().road_thruput.total_for(r.id)) prettyprint_usize(app.primary.sim.get_analytics().road_thruput.total_for(r.id))
))); )));
rows.push(txt.draw(ctx)); rows.push(txt.into_widget(ctx));
rows.push(opts.to_controls(ctx, app)); rows.push(opts.to_controls(ctx, app));
@ -255,7 +257,7 @@ fn header(ctx: &EventCtx, app: &App, details: &mut Details, id: LaneID, tab: Tab
rows.push(Widget::row(vec![ rows.push(Widget::row(vec![
Line(format!("{} #{}", label, id.0)) Line(format!("{} #{}", label, id.0))
.small_heading() .small_heading()
.draw(ctx), .into_widget(ctx),
header_btns(ctx), header_btns(ctx),
])); ]));
rows.push(format!("@ {}", r.get_name(app.opts.language.as_ref())).text_widget(ctx)); rows.push(format!("@ {}", r.get_name(app.opts.language.as_ref())).text_widget(ctx));

4
game/src/info/mod.rs
View File

@ -641,7 +641,7 @@ fn make_table<I: Into<String>>(ctx: &EventCtx, rows: Vec<(I, String)>) -> Vec<Wi
rows.into_iter() rows.into_iter()
.map(|(k, v)| { .map(|(k, v)| {
Widget::row(vec![ Widget::row(vec![
Line(k).secondary().draw(ctx), Line(k).secondary().into_widget(ctx),
// TODO not quite... // TODO not quite...
v.text_widget(ctx).centered_vert().align_right(), v.text_widget(ctx).centered_vert().align_right(),
]) ])
@ -678,7 +678,7 @@ fn throughput<F: Fn(&Analytics) -> Vec<(AgentType, Vec<(Time, usize)>)>>(
let mut plot_opts = PlotOptions::filterable(); let mut plot_opts = PlotOptions::filterable();
plot_opts.disabled = opts.disabled_series(); plot_opts.disabled = opts.disabled_series();
Widget::col(vec![ Widget::col(vec![
Line(title).small_heading().draw(ctx), Line(title).small_heading().into_widget(ctx),
LinePlot::new(ctx, series, plot_opts), LinePlot::new(ctx, series, plot_opts),
]) ])
.padding(10) .padding(10)

6
game/src/info/parking_lot.rs
View File

@ -43,7 +43,9 @@ pub fn info(ctx: &mut EventCtx, app: &App, details: &mut Details, id: ParkingLot
} }
let section = Widget::col(vec![ let section = Widget::col(vec![
Line("Parking spots available").small_heading().draw(ctx), Line("Parking spots available")
.small_heading()
.into_widget(ctx),
LinePlot::new( LinePlot::new(
ctx, ctx,
series, series,
@ -75,7 +77,7 @@ pub fn info(ctx: &mut EventCtx, app: &App, details: &mut Details, id: ParkingLot
fn header(ctx: &EventCtx, details: &mut Details, id: ParkingLotID, tab: Tab) -> Vec<Widget> { fn header(ctx: &EventCtx, details: &mut Details, id: ParkingLotID, tab: Tab) -> Vec<Widget> {
vec![ vec![
Widget::row(vec![ Widget::row(vec![
Line(id.to_string()).small_heading().draw(ctx), Line(id.to_string()).small_heading().into_widget(ctx),
header_btns(ctx), header_btns(ctx),
]), ]),
make_tabs( make_tabs(

16
game/src/info/person.rs
View File

@ -320,7 +320,7 @@ pub fn bio(
Line("Pandemic model state: ").secondary(), Line("Pandemic model state: ").secondary(),
Line(status), Line(status),
]) ])
.draw(ctx), .into_widget(ctx),
); );
} }
@ -368,7 +368,7 @@ pub fn bio(
app.primary.sim.debug_car_ui(car) app.primary.sim.debug_car_ui(car)
))) )))
.wrap_to_pct(ctx, 20) .wrap_to_pct(ctx, 20)
.draw(ctx), .into_widget(ctx),
); );
} }
} }
@ -414,7 +414,7 @@ pub fn schedule(
trip.departure - last_t, trip.departure - last_t,
at at
))) )))
.draw(ctx), .into_widget(ctx),
); );
// TODO Ideally end time if we know // TODO Ideally end time if we know
last_t = trip.departure; last_t = trip.departure;
@ -444,7 +444,7 @@ pub fn schedule(
app.primary.sim.get_end_of_day() - last_trip.departure, app.primary.sim.get_end_of_day() - last_trip.departure,
at at
))) )))
.draw(ctx), .into_widget(ctx),
); );
rows rows
@ -459,7 +459,7 @@ pub fn crowd(
let mut rows = vec![]; let mut rows = vec![];
rows.push(Widget::row(vec![ rows.push(Widget::row(vec![
Line("Pedestrian crowd").small_heading().draw(ctx), Line("Pedestrian crowd").small_heading().into_widget(ctx),
header_btns(ctx), header_btns(ctx),
])); ]));
@ -506,7 +506,7 @@ pub fn parked_car(
rows.push(Widget::row(vec![ rows.push(Widget::row(vec![
Line(format!("Parked car #{}", id.0)) Line(format!("Parked car #{}", id.0))
.small_heading() .small_heading()
.draw(ctx), .into_widget(ctx),
Widget::row(vec![ Widget::row(vec![
// Little indirect, but the handler of this action is actually the ContextualActions // Little indirect, but the handler of this action is actually the ContextualActions
// for SandboxMode. // for SandboxMode.
@ -622,7 +622,7 @@ fn header(
}; };
rows.push(Widget::custom_row(vec![ rows.push(Widget::custom_row(vec![
Line(format!("{}", id)).small_heading().draw(ctx), Line(format!("{}", id)).small_heading().into_widget(ctx),
if let Some(icon) = maybe_icon { if let Some(icon) = maybe_icon {
let batch = GeomBatch::load_svg(ctx, icon) let batch = GeomBatch::load_svg(ctx, icon)
.color(RewriteColor::ChangeAll(Color::hex("#A3A3A3"))) .color(RewriteColor::ChangeAll(Color::hex("#A3A3A3")))
@ -636,7 +636,7 @@ fn header(
Line(format!("{}", descr)) Line(format!("{}", descr))
.small_heading() .small_heading()
.fg(Color::hex("#A3A3A3")) .fg(Color::hex("#A3A3A3"))
.draw(ctx) .into_widget(ctx)
.margin_horiz(10), .margin_horiz(10),
Widget::row(vec![ Widget::row(vec![
// Little indirect, but the handler of this action is actually the ContextualActions // Little indirect, but the handler of this action is actually the ContextualActions

30
game/src/info/trip.rs
View File

@ -66,7 +66,7 @@ pub fn ongoing(
{ {
col.push(Widget::custom_row(vec![ col.push(Widget::custom_row(vec![
Widget::custom_row(vec![Line("Trip time").secondary().draw(ctx)]) Widget::custom_row(vec![Line("Trip time").secondary().into_widget(ctx)])
.force_width_pct(ctx, col_width), .force_width_pct(ctx, col_width),
Text::from_all(vec![ Text::from_all(vec![
Line(props.total_time.to_string(&app.opts.units)), Line(props.total_time.to_string(&app.opts.units)),
@ -77,25 +77,25 @@ pub fn ongoing(
)) ))
.secondary(), .secondary(),
]) ])
.draw(ctx), .into_widget(ctx),
])); ]));
} }
{ {
col.push(Widget::custom_row(vec![ col.push(Widget::custom_row(vec![
Widget::custom_row(vec![Line("Distance").secondary().draw(ctx)]) Widget::custom_row(vec![Line("Distance").secondary().into_widget(ctx)])
.force_width_pct(ctx, col_width), .force_width_pct(ctx, col_width),
Text::from_all(vec![ Text::from_all(vec![
Line(props.dist_crossed.to_string(&app.opts.units)), Line(props.dist_crossed.to_string(&app.opts.units)),
Line(format!("/{}", props.total_dist.to_string(&app.opts.units))).secondary(), Line(format!("/{}", props.total_dist.to_string(&app.opts.units))).secondary(),
]) ])
.draw(ctx), .into_widget(ctx),
])); ]));
} }
{ {
col.push(Widget::custom_row(vec![ col.push(Widget::custom_row(vec![
Line("Waiting") Line("Waiting")
.secondary() .secondary()
.draw(ctx) .into_widget(ctx)
.container() .container()
.force_width_pct(ctx, col_width), .force_width_pct(ctx, col_width),
Widget::col(vec![ Widget::col(vec![
@ -111,15 +111,15 @@ pub fn ongoing(
}, },
Line(format!(" total of {} time spent waiting", activity)).secondary(), Line(format!(" total of {} time spent waiting", activity)).secondary(),
]) ])
.draw(ctx), .into_widget(ctx),
]), ]),
])); ]));
} }
{ {
col.push(Widget::custom_row(vec![ col.push(Widget::custom_row(vec![
Widget::custom_row(vec![Line("Purpose").secondary().draw(ctx)]) Widget::custom_row(vec![Line("Purpose").secondary().into_widget(ctx)])
.force_width_pct(ctx, col_width), .force_width_pct(ctx, col_width),
Line(trip.purpose.to_string()).secondary().draw(ctx), Line(trip.purpose.to_string()).secondary().into_widget(ctx),
])); ]));
} }
@ -295,7 +295,7 @@ pub fn finished(
if let Some(end_time) = phases.last().as_ref().and_then(|p| p.end_time) { if let Some(end_time) = phases.last().as_ref().and_then(|p| p.end_time) {
col.push(Widget::custom_row(vec![ col.push(Widget::custom_row(vec![
Widget::custom_row(vec![Line("Trip time").secondary().draw(ctx)]) Widget::custom_row(vec![Line("Trip time").secondary().into_widget(ctx)])
.force_width_pct(ctx, col_width), .force_width_pct(ctx, col_width),
(end_time - trip.departure) (end_time - trip.departure)
.to_string(&app.opts.units) .to_string(&app.opts.units)
@ -303,7 +303,7 @@ pub fn finished(
])); ]));
} else { } else {
col.push(Widget::custom_row(vec![ col.push(Widget::custom_row(vec![
Widget::custom_row(vec![Line("Trip time").secondary().draw(ctx)]) Widget::custom_row(vec![Line("Trip time").secondary().into_widget(ctx)])
.force_width_pct(ctx, col_width), .force_width_pct(ctx, col_width),
"Trip didn't complete before map changes".text_widget(ctx), "Trip didn't complete before map changes".text_widget(ctx),
])); ]));
@ -313,15 +313,17 @@ pub fn finished(
// look at the prebaked results! Misleading -- change the text. // look at the prebaked results! Misleading -- change the text.
let (_, waiting, _) = app.primary.sim.finished_trip_details(id).unwrap(); let (_, waiting, _) = app.primary.sim.finished_trip_details(id).unwrap();
col.push(Widget::custom_row(vec![ col.push(Widget::custom_row(vec![
Widget::custom_row(vec![Line("Total waiting time").secondary().draw(ctx)]) Widget::custom_row(vec![Line("Total waiting time")
.secondary()
.into_widget(ctx)])
.force_width_pct(ctx, col_width), .force_width_pct(ctx, col_width),
waiting.to_string(&app.opts.units).text_widget(ctx), waiting.to_string(&app.opts.units).text_widget(ctx),
])); ]));
col.push(Widget::custom_row(vec![ col.push(Widget::custom_row(vec![
Widget::custom_row(vec![Line("Purpose").secondary().draw(ctx)]) Widget::custom_row(vec![Line("Purpose").secondary().into_widget(ctx)])
.force_width_pct(ctx, col_width), .force_width_pct(ctx, col_width),
Line(trip.purpose.to_string()).secondary().draw(ctx), Line(trip.purpose.to_string()).secondary().into_widget(ctx),
])); ]));
} }
@ -352,7 +354,7 @@ pub fn cancelled(
trip.cancellation_reason.as_ref().unwrap() trip.cancellation_reason.as_ref().unwrap()
))) )))
.wrap_to_pct(ctx, 20) .wrap_to_pct(ctx, 20)
.draw(ctx)]; .into_widget(ctx)];
col.extend(make_table(ctx, vec![("Purpose", trip.purpose.to_string())])); col.extend(make_table(ctx, vec![("Purpose", trip.purpose.to_string())]));

2
game/src/layer/elevation.rs
View File

@ -93,7 +93,7 @@ impl Elevation {
Line(format!("Steepest road: {:.0}% grade", max * 100.0)), Line(format!("Steepest road: {:.0}% grade", max * 100.0)),
Line("Note: elevation data is currently wrong!").secondary(), Line("Note: elevation data is currently wrong!").secondary(),
]) ])
.draw(ctx), .into_widget(ctx),
ColorLegend::gradient(ctx, &app.cs.good_to_bad_red, vec!["flat", "steep"]), ColorLegend::gradient(ctx, &app.cs.good_to_bad_red, vec!["flat", "steep"]),
])) ]))
.aligned(HorizontalAlignment::Right, VerticalAlignment::Center) .aligned(HorizontalAlignment::Right, VerticalAlignment::Center)

8
game/src/layer/map.rs
View File

@ -142,14 +142,14 @@ impl BikeActivity {
total_dist.to_string(&app.opts.units) total_dist.to_string(&app.opts.units)
)), )),
]) ])
.draw(ctx), .into_widget(ctx),
Line("Throughput on bike lanes").draw(ctx), Line("Throughput on bike lanes").into_widget(ctx),
ColorLegend::gradient( ColorLegend::gradient(
ctx, ctx,
&app.cs.good_to_bad_green, &app.cs.good_to_bad_green,
vec!["lowest count", "highest"], vec!["lowest count", "highest"],
), ),
Line("Throughput on unprotected roads").draw(ctx), Line("Throughput on unprotected roads").into_widget(ctx),
ColorLegend::gradient( ColorLegend::gradient(
ctx, ctx,
&app.cs.good_to_bad_red, &app.cs.good_to_bad_red,
@ -254,7 +254,7 @@ impl Static {
edits.original_intersections.len() edits.original_intersections.len()
)), )),
]) ])
.draw(ctx), .into_widget(ctx),
) )
} }

2
game/src/layer/mod.rs
View File

@ -83,7 +83,7 @@ impl PickLayer {
pub fn pick(ctx: &mut EventCtx, app: &App) -> Box<dyn State<App>> { pub fn pick(ctx: &mut EventCtx, app: &App) -> Box<dyn State<App>> {
let mut col = vec![Widget::custom_row(vec![ let mut col = vec![Widget::custom_row(vec![
Line("Layers").small_heading().draw(ctx), Line("Layers").small_heading().into_widget(ctx),
ctx.style().btn_close_widget(ctx), ctx.style().btn_close_widget(ctx),
])]; ])];

2
game/src/layer/pandemic.rs
View File

@ -205,7 +205,7 @@ fn make_controls(ctx: &mut EventCtx, app: &App, opts: &Options, legend: Option<W
(model.count_dead() as f64) * pct (model.count_dead() as f64) * pct
)), )),
]) ])
.draw(ctx), .into_widget(ctx),
Widget::row(vec![ Widget::row(vec![
"Filter:".text_widget(ctx), "Filter:".text_widget(ctx),
Widget::dropdown( Widget::dropdown(

6
game/src/layer/parking.rs
View File

@ -125,7 +125,7 @@ impl Occupancy {
Line("Parking simulation disabled."), Line("Parking simulation disabled."),
Line("Every building has unlimited capacity.").secondary(), Line("Every building has unlimited capacity.").secondary(),
]) ])
.draw(ctx), .into_widget(ctx),
])) ]))
.aligned(HorizontalAlignment::Right, VerticalAlignment::Center) .aligned(HorizontalAlignment::Right, VerticalAlignment::Center)
.build(ctx); .build(ctx);
@ -226,7 +226,7 @@ impl Occupancy {
prettyprint_usize(private_filled + private_avail) prettyprint_usize(private_filled + private_avail)
)), )),
]) ])
.draw(ctx), .into_widget(ctx),
Widget::row(vec![ Widget::row(vec![
Toggle::switch(ctx, "On-street spots", None, onstreet), Toggle::switch(ctx, "On-street spots", None, onstreet),
Toggle::switch(ctx, "Parking lots", None, lots), Toggle::switch(ctx, "Parking lots", None, lots),
@ -363,7 +363,7 @@ impl Efficiency {
header(ctx, "Parking efficiency"), header(ctx, "Parking efficiency"),
Text::from(Line("How far away are people parked? (minutes)").secondary()) Text::from(Line("How far away are people parked? (minutes)").secondary())
.wrap_to_pct(ctx, 15) .wrap_to_pct(ctx, 15)
.draw(ctx), .into_widget(ctx),
ColorLegend::gradient( ColorLegend::gradient(
ctx, ctx,
&app.cs.good_to_bad_red, &app.cs.good_to_bad_red,

6
game/src/layer/population.rs
View File

@ -163,11 +163,13 @@ fn make_controls(ctx: &mut EventCtx, app: &App, opts: &Options, legend: Option<W
Widget::row(vec![ Widget::row(vec![
Widget::row(vec![ Widget::row(vec![
Image::icon("system/assets/tools/home.svg").into_widget(ctx), Image::icon("system/assets/tools/home.svg").into_widget(ctx),
Line(prettyprint_usize(ppl_in_bldg)).small().draw(ctx), Line(prettyprint_usize(ppl_in_bldg))
.small()
.into_widget(ctx),
]), ]),
Line(format!("Off-map: {}", prettyprint_usize(ppl_off_map))) Line(format!("Off-map: {}", prettyprint_usize(ppl_off_map)))
.small() .small()
.draw(ctx), .into_widget(ctx),
]) ])
.centered(), .centered(),
]; ];

6
game/src/layer/traffic.rs
View File

@ -77,7 +77,7 @@ impl Backpressure {
.secondary(), .secondary(),
) )
.wrap_to_pct(ctx, 15) .wrap_to_pct(ctx, 15)
.draw(ctx), .into_widget(ctx),
ColorLegend::gradient( ColorLegend::gradient(
ctx, ctx,
&app.cs.good_to_bad_red, &app.cs.good_to_bad_red,
@ -221,7 +221,7 @@ impl Throughput {
header(ctx, "Throughput"), header(ctx, "Throughput"),
Text::from(Line("This counts all people crossing since midnight").secondary()) Text::from(Line("This counts all people crossing since midnight").secondary())
.wrap_to_pct(ctx, 15) .wrap_to_pct(ctx, 15)
.draw(ctx), .into_widget(ctx),
if app.has_prebaked().is_some() { if app.has_prebaked().is_some() {
Toggle::switch(ctx, "Compare before proposal", None, false) Toggle::switch(ctx, "Compare before proposal", None, false)
} else { } else {
@ -455,7 +455,7 @@ impl TrafficJams {
Line("A jam starts when delay exceeds 5 mins, then spreads out").secondary(), Line("A jam starts when delay exceeds 5 mins, then spreads out").secondary(),
) )
.wrap_to_pct(ctx, 15) .wrap_to_pct(ctx, 15)
.draw(ctx), .into_widget(ctx),
format!("{} jams detected", cnt).text_widget(ctx), format!("{} jams detected", cnt).text_widget(ctx),
])) ]))
.aligned(HorizontalAlignment::Right, VerticalAlignment::Center) .aligned(HorizontalAlignment::Right, VerticalAlignment::Center)

10
game/src/pregame.rs
View File

@ -96,7 +96,7 @@ impl MainMenu {
{ {
let mut txt = Text::from(Line("A/B STREET").display_title()); let mut txt = Text::from(Line("A/B STREET").display_title());
txt.add(Line("Created by Dustin Carlino, Yuwen Li, & Michael Kirk")); txt.add(Line("Created by Dustin Carlino, Yuwen Li, & Michael Kirk"));
txt.draw(ctx).centered_horiz() txt.into_widget(ctx).centered_horiz()
}, },
Widget::row({ Widget::row({
let btn_builder = ctx let btn_builder = ctx
@ -177,7 +177,7 @@ impl MainMenu {
ctx.style().btn_outline.text("About").build_def(ctx), ctx.style().btn_outline.text("About").build_def(ctx),
ctx.style().btn_outline.text("Feedback").build_def(ctx), ctx.style().btn_outline.text("Feedback").build_def(ctx),
]), ]),
built_info::time().draw(ctx), built_info::time().into_widget(ctx),
]) ])
.centered(), .centered(),
]; ];
@ -283,7 +283,7 @@ impl About {
), ),
]) ])
.wrap_to_pct(ctx, 50) .wrap_to_pct(ctx, 50)
.draw(ctx) .into_widget(ctx)
.centered_horiz() .centered_horiz()
.align_vert_center() .align_vert_center()
.bg(app.cs.panel_bg) .bg(app.cs.panel_bg)
@ -357,7 +357,7 @@ impl Proposals {
} }
current_tab.push( current_tab.push(
txt.wrap_to_pct(ctx, 70) txt.wrap_to_pct(ctx, 70)
.draw(ctx) .into_widget(ctx)
.margin_below(15) .margin_below(15)
.margin_above(15), .margin_above(15),
); );
@ -410,7 +410,7 @@ impl Proposals {
"These are proposed changes to Seattle made by community members.", "These are proposed changes to Seattle made by community members.",
)); ));
txt.add(Line("Contact dabreegster@gmail.com to add your idea here!")); txt.add(Line("Contact dabreegster@gmail.com to add your idea here!"));
txt.draw(ctx).centered_horiz().margin_below(20) txt.into_widget(ctx).centered_horiz().margin_below(20)
}, },
Widget::custom_row(buttons).flex_wrap(ctx, Percent::int(80)), Widget::custom_row(buttons).flex_wrap(ctx, Percent::int(80)),
]; ];

6
game/src/sandbox/dashboards/commuter.rs
View File

@ -318,7 +318,7 @@ impl CommuterPatterns {
} }
} }
self.panel.replace(ctx, "current", txt.draw(ctx)); self.panel.replace(ctx, "current", txt.into_widget(ctx));
let new_scale = ColorLegend::gradient( let new_scale = ColorLegend::gradient(
ctx, ctx,
@ -681,7 +681,9 @@ fn partition_sidewalk_loops(app: &App) -> Vec<Loop> {
fn make_panel(ctx: &mut EventCtx, app: &App) -> Panel { fn make_panel(ctx: &mut EventCtx, app: &App) -> Panel {
Panel::new(Widget::col(vec![ Panel::new(Widget::col(vec![
Widget::row(vec![ Widget::row(vec![
Line("Commute map by block").small_heading().draw(ctx), Line("Commute map by block")
.small_heading()
.into_widget(ctx),
ctx.style().btn_close_widget(ctx), ctx.style().btn_close_widget(ctx),
]), ]),
Toggle::choice(ctx, "from / to this block", "from", "to", Key::Space, true), Toggle::choice(ctx, "from / to this block", "from", "to", Key::Space, true),

2
game/src/sandbox/dashboards/misc.rs
View File

@ -153,7 +153,7 @@ impl TransitRoutes {
DashTab::TransitRoutes.picker(ctx, app), DashTab::TransitRoutes.picker(ctx, app),
Line(format!("{} Transit routes", routes.len())) Line(format!("{} Transit routes", routes.len()))
.small_heading() .small_heading()
.draw(ctx), .into_widget(ctx),
Widget::row(vec![ Widget::row(vec![
Image::icon("system/assets/tools/search.svg").into_widget(ctx), Image::icon("system/assets/tools/search.svg").into_widget(ctx),
Autocomplete::new( Autocomplete::new(

2
game/src/sandbox/dashboards/mod.rs
View File

@ -45,7 +45,7 @@ impl DashTab {
} }
Widget::row(vec![ Widget::row(vec![
Image::icon("system/assets/meters/trip_histogram.svg").into_widget(ctx), Image::icon("system/assets/meters/trip_histogram.svg").into_widget(ctx),
Line("Data").big_heading_plain().draw(ctx), Line("Data").big_heading_plain().into_widget(ctx),
Widget::dropdown(ctx, "tab", self, choices), Widget::dropdown(ctx, "tab", self, choices),
format!("By {}", app.primary.sim.time().ampm_tostring()) format!("By {}", app.primary.sim.time().ampm_tostring())
.text_widget(ctx) .text_widget(ctx)

2
game/src/sandbox/dashboards/parking_overhead.rs
View File

@ -186,7 +186,7 @@ fn make_panel(ctx: &mut EventCtx, app: &App, table: &Table<App, Entry, Filters>)
), ),
Line("since the time spent driving off-map isn't shown here."), Line("since the time spent driving off-map isn't shown here."),
]) ])
.draw(ctx), .into_widget(ctx),
Filler::square_width(ctx, 0.15).named("preview"), Filler::square_width(ctx, 0.15).named("preview"),
]) ])
.evenly_spaced(), .evenly_spaced(),

20
game/src/sandbox/dashboards/summaries.rs
View File

@ -179,7 +179,7 @@ fn summary_boxes(ctx: &mut EventCtx, app: &App, filter: &Filter) -> Widget {
.small(), .small(),
Line(format!("Saved {} in total", sum_faster)).small(), Line(format!("Saved {} in total", sum_faster)).small(),
]) ])
.draw(ctx) .into_widget(ctx)
.container() .container()
.padding(20) .padding(20)
.bg(Color::hex("#72CE36").alpha(0.5)) .bg(Color::hex("#72CE36").alpha(0.5))
@ -202,7 +202,7 @@ fn summary_boxes(ctx: &mut EventCtx, app: &App, filter: &Filter) -> Widget {
.small(), .small(),
Line(format!("Lost {} in total", sum_slower)).small(), Line(format!("Lost {} in total", sum_slower)).small(),
]) ])
.draw(ctx) .into_widget(ctx)
.container() .container()
.padding(20) .padding(20)
.bg(Color::hex("#EB3223").alpha(0.5)) .bg(Color::hex("#EB3223").alpha(0.5))
@ -215,7 +215,7 @@ fn summary_boxes(ctx: &mut EventCtx, app: &App, filter: &Filter) -> Widget {
)) ))
.small(), .small(),
]) ])
.draw(ctx) .into_widget(ctx)
.container() .container()
.padding(20) .padding(20)
.bg(Color::hex("#F4DA22").alpha(0.5)) .bg(Color::hex("#F4DA22").alpha(0.5))
@ -235,7 +235,9 @@ fn scatter_plot(ctx: &mut EventCtx, app: &App, filter: &Filter) -> Widget {
} }
Widget::col(vec![ Widget::col(vec![
Line("Trip time before and after").small_heading().draw(ctx), Line("Trip time before and after")
.small_heading()
.into_widget(ctx),
CompareTimes::new( CompareTimes::new(
ctx, ctx,
format!( format!(
@ -393,10 +395,14 @@ fn contingency_table(ctx: &mut EventCtx, app: &App, filter: &Filter) -> Widget {
Line("Number of slower/faster trips").small_heading(), Line("Number of slower/faster trips").small_heading(),
Line("by ranges of trip time (after)").small_heading(), Line("by ranges of trip time (after)").small_heading(),
]) ])
.draw(ctx), .into_widget(ctx),
Line("number of trips (faster)").secondary().draw(ctx), Line("number of trips (faster)")
.secondary()
.into_widget(ctx),
DrawWithTooltips::new(ctx, batch, tooltips, Box::new(|_| GeomBatch::new())), DrawWithTooltips::new(ctx, batch, tooltips, Box::new(|_| GeomBatch::new())),
Line("number of trips (slower)").secondary().draw(ctx), Line("number of trips (slower)")
.secondary()
.into_widget(ctx),
]) ])
.padding(16) .padding(16)
.outline(ctx.style().section_outline) .outline(ctx.style().section_outline)

4
game/src/sandbox/dashboards/traffic_signals.rs
View File

@ -43,7 +43,7 @@ impl TrafficSignalDemand {
Widget::row(vec![ Widget::row(vec![
Line("Traffic signal demand over time") Line("Traffic signal demand over time")
.small_heading() .small_heading()
.draw(ctx), .into_widget(ctx),
ctx.style().btn_close_widget(ctx), ctx.style().btn_close_widget(ctx),
]), ]),
Text::from_all(vec![ Text::from_all(vec![
@ -53,7 +53,7 @@ impl TrafficSignalDemand {
Key::RightArrow.txt(ctx), Key::RightArrow.txt(ctx),
Line(" to adjust the hour"), Line(" to adjust the hour"),
]) ])
.draw(ctx), .into_widget(ctx),
Widget::row(vec![ Widget::row(vec![
"Hour:".text_widget(ctx), "Hour:".text_widget(ctx),
Spinner::widget(ctx, (0, 24), 7).named("hour"), Spinner::widget(ctx, (0, 24), 7).named("hour"),

8
game/src/sandbox/gameplay/actdev.rs
View File

@ -113,19 +113,19 @@ impl GameplayState for Actdev {
"about A/B Street" => { "about A/B Street" => {
let panel = Panel::new(Widget::col(vec![ let panel = Panel::new(Widget::col(vec![
Widget::row(vec![ Widget::row(vec![
Line("About A/B Street").small_heading().draw(ctx), Line("About A/B Street").small_heading().into_widget(ctx),
ctx.style().btn_close_widget(ctx), ctx.style().btn_close_widget(ctx),
]), ]),
Line("Created by Dustin Carlino, Yuwen Li, & Michael Kirk") Line("Created by Dustin Carlino, Yuwen Li, & Michael Kirk")
.small() .small()
.draw(ctx), .into_widget(ctx),
Text::from(Line( Text::from(Line(
"A/B Street is a traffic simulation game based on OpenStreetMap. You \ "A/B Street is a traffic simulation game based on OpenStreetMap. You \
can modify roads and intersections, measure the effects on different \ can modify roads and intersections, measure the effects on different \
groups, and advocate for your proposal.", groups, and advocate for your proposal.",
)) ))
.wrap_to_pct(ctx, 50) .wrap_to_pct(ctx, 50)
.draw(ctx), .into_widget(ctx),
"This is a simplified version. Check out the full version below." "This is a simplified version. Check out the full version below."
.text_widget(ctx), .text_widget(ctx),
ctx.style().btn_outline.text("abstreet.org").build_def(ctx), ctx.style().btn_outline.text("abstreet.org").build_def(ctx),
@ -200,7 +200,7 @@ impl GameplayState for Actdev {
.centered_vert(), .centered_vert(),
Line(nice_map_name(app.primary.map.get_name())) Line(nice_map_name(app.primary.map.get_name()))
.small_heading() .small_heading()
.draw(ctx), .into_widget(ctx),
Widget::vert_separator(ctx, 50.0), Widget::vert_separator(ctx, 50.0),
ctx.style() ctx.style()
.btn_popup_icon_text("system/assets/tools/calendar.svg", "scenario") .btn_popup_icon_text("system/assets/tools/calendar.svg", "scenario")

18
game/src/sandbox/gameplay/commute.rs
View File

@ -167,7 +167,7 @@ impl GameplayState for OptimizeCommute {
txt.add(Line("Use the locator at the top right to find the VIP.")); txt.add(Line("Use the locator at the top right to find the VIP."));
txt.add(Line("You can wait for one of their trips to begin or end.")); txt.add(Line("You can wait for one of their trips to begin or end."));
txt.add(Line("Focus on trips spent mostly waiting")); txt.add(Line("Focus on trips spent mostly waiting"));
let contents = txt.draw(ctx); let contents = txt.into_widget(ctx);
return Some(Transition::Push(FYI::new(ctx, contents, app.cs.panel_bg))); return Some(Transition::Push(FYI::new(ctx, contents, app.cs.panel_bg)));
} }
_ => unreachable!(), _ => unreachable!(),
@ -254,7 +254,7 @@ fn make_meter(
.icon("system/assets/tools/location.svg") .icon("system/assets/tools/location.svg")
.build_widget(ctx, "locate VIP"), .build_widget(ctx, "locate VIP"),
format!("{}/{} trips done", done, trips).text_widget(ctx), format!("{}/{} trips done", done, trips).text_widget(ctx),
txt.draw(ctx), txt.into_widget(ctx),
]), ]),
])) ]))
.aligned(HorizontalAlignment::Right, VerticalAlignment::Top) .aligned(HorizontalAlignment::Right, VerticalAlignment::Top)
@ -326,11 +326,11 @@ fn cutscene_task(mode: &GameplayMode) -> Box<dyn Fn(&mut EventCtx) -> Widget> {
Line(format!("Speed up the VIP's trips by a total of {}", goal)).fg(Color::BLACK), Line(format!("Speed up the VIP's trips by a total of {}", goal)).fg(Color::BLACK),
Line("Ignore the damage done to everyone else.").fg(Color::BLACK), Line("Ignore the damage done to everyone else.").fg(Color::BLACK),
]) ])
.draw(ctx) .into_widget(ctx)
.margin_below(30), .margin_below(30),
Widget::row(vec![ Widget::row(vec![
Widget::col(vec![ Widget::col(vec![
Line("Time").fg(Color::BLACK).draw(ctx), Line("Time").fg(Color::BLACK).into_widget(ctx),
Image::icon("system/assets/tools/time.svg") Image::icon("system/assets/tools/time.svg")
.color(Color::BLACK) .color(Color::BLACK)
.into_widget(ctx), .into_widget(ctx),
@ -338,10 +338,10 @@ fn cutscene_task(mode: &GameplayMode) -> Box<dyn Fn(&mut EventCtx) -> Widget> {
Line("Until the VIP's").fg(Color::BLACK), Line("Until the VIP's").fg(Color::BLACK),
Line("last trip is done").fg(Color::BLACK), Line("last trip is done").fg(Color::BLACK),
]) ])
.draw(ctx), .into_widget(ctx),
]), ]),
Widget::col(vec![ Widget::col(vec![
Line("Goal").fg(Color::BLACK).draw(ctx), Line("Goal").fg(Color::BLACK).into_widget(ctx),
Image::icon("system/assets/tools/location.svg") Image::icon("system/assets/tools/location.svg")
.color(Color::BLACK) .color(Color::BLACK)
.into_widget(ctx), .into_widget(ctx),
@ -349,10 +349,10 @@ fn cutscene_task(mode: &GameplayMode) -> Box<dyn Fn(&mut EventCtx) -> Widget> {
Line("Speed up the VIP's trips").fg(Color::BLACK), Line("Speed up the VIP's trips").fg(Color::BLACK),
Line(format!("by at least {}", goal)).fg(Color::BLACK), Line(format!("by at least {}", goal)).fg(Color::BLACK),
]) ])
.draw(ctx), .into_widget(ctx),
]), ]),
Widget::col(vec![ Widget::col(vec![
Line("Score").fg(Color::BLACK).draw(ctx), Line("Score").fg(Color::BLACK).into_widget(ctx),
Image::icon("system/assets/tools/star.svg") Image::icon("system/assets/tools/star.svg")
.color(Color::BLACK) .color(Color::BLACK)
.into_widget(ctx), .into_widget(ctx),
@ -360,7 +360,7 @@ fn cutscene_task(mode: &GameplayMode) -> Box<dyn Fn(&mut EventCtx) -> Widget> {
Line("How much time").fg(Color::BLACK), Line("How much time").fg(Color::BLACK),
Line("the VIP saves").fg(Color::BLACK), Line("the VIP saves").fg(Color::BLACK),
]) ])
.draw(ctx), .into_widget(ctx),
]), ]),
]) ])
.evenly_spaced(), .evenly_spaced(),

29
game/src/sandbox/gameplay/fix_traffic_signals.rs
View File

@ -182,7 +182,7 @@ impl GameplayState for FixTrafficSignals {
Key::J.txt(ctx), Key::J.txt(ctx),
Line("ams"), Line("ams"),
]); ]);
let contents = txt.draw(ctx); let contents = txt.into_widget(ctx);
return Some(Transition::Push(FYI::new(ctx, contents, app.cs.panel_bg))); return Some(Transition::Push(FYI::new(ctx, contents, app.cs.panel_bg)));
} }
"try again" => { "try again" => {
@ -227,7 +227,7 @@ impl GameplayState for FixTrafficSignals {
), ),
Line("Then you should check if your changes work from midnight."), Line("Then you should check if your changes work from midnight."),
]) ])
.draw(ctx), .into_widget(ctx),
app.cs.panel_bg, app.cs.panel_bg,
))); )));
} }
@ -251,7 +251,7 @@ impl GameplayState for FixTrafficSignals {
Widget::row(vec![ Widget::row(vec![
Line(format!("Delay exceeded {} at {}", THRESHOLD, time)) Line(format!("Delay exceeded {} at {}", THRESHOLD, time))
.fg(Color::RED) .fg(Color::RED)
.draw(ctx) .into_widget(ctx)
.centered_vert(), .centered_vert(),
ctx.style().btn_outline.text("try again").build_def(ctx), ctx.style().btn_outline.text("try again").build_def(ctx),
]), ]),
@ -266,7 +266,7 @@ impl GameplayState for FixTrafficSignals {
"Keep delay at all intersections under {}", "Keep delay at all intersections under {}",
THRESHOLD THRESHOLD
)) ))
.draw(ctx), .into_widget(ctx),
ctx.style() ctx.style()
.btn_plain .btn_plain
.icon_text("system/assets/tools/lightbulb.svg", "Hint") .icon_text("system/assets/tools/lightbulb.svg", "Hint")
@ -303,7 +303,7 @@ fn make_meter(ctx: &mut EventCtx, app: &App, worst: Option<(IntersectionID, Dura
Color::hex("#EB3223") Color::hex("#EB3223")
}), }),
]) ])
.draw(ctx), .into_widget(ctx),
ctx.style() ctx.style()
.btn_plain .btn_plain
.icon("system/assets/tools/location.svg") .icon("system/assets/tools/location.svg")
@ -320,7 +320,8 @@ fn make_meter(ctx: &mut EventCtx, app: &App, worst: Option<(IntersectionID, Dura
} else { } else {
Widget::nothing() Widget::nothing()
}, },
Text::from_all(vec![Line("Worst delay: "), Line("none!").secondary()]).draw(ctx), Text::from_all(vec![Line("Worst delay: "), Line("none!").secondary()])
.into_widget(ctx),
Image::icon("system/assets/tools/location.svg") Image::icon("system/assets/tools/location.svg")
.color(RewriteColor::ChangeAlpha(0.5)) .color(RewriteColor::ChangeAlpha(0.5))
.into_widget(ctx) .into_widget(ctx)
@ -373,18 +374,18 @@ fn cutscene_pt1_task(ctx: &mut EventCtx) -> Widget {
Line("Survive as long as possible through 24 hours of a busy weekday.") Line("Survive as long as possible through 24 hours of a busy weekday.")
.fg(Color::BLACK), .fg(Color::BLACK),
]) ])
.draw(ctx) .into_widget(ctx)
.margin_below(30), .margin_below(30),
Widget::custom_row(vec![ Widget::custom_row(vec![
Widget::col(vec![ Widget::col(vec![
Line("Time").fg(Color::BLACK).draw(ctx), Line("Time").fg(Color::BLACK).into_widget(ctx),
Image::icon("system/assets/tools/time.svg") Image::icon("system/assets/tools/time.svg")
.color(Color::BLACK) .color(Color::BLACK)
.into_widget(ctx), .into_widget(ctx),
Line("24 hours").fg(Color::BLACK).draw(ctx), Line("24 hours").fg(Color::BLACK).into_widget(ctx),
]), ]),
Widget::col(vec![ Widget::col(vec![
Line("Goal").fg(Color::BLACK).draw(ctx), Line("Goal").fg(Color::BLACK).into_widget(ctx),
Image::icon("system/assets/tools/location.svg") Image::icon("system/assets/tools/location.svg")
.color(Color::BLACK) .color(Color::BLACK)
.into_widget(ctx), .into_widget(ctx),
@ -392,14 +393,16 @@ fn cutscene_pt1_task(ctx: &mut EventCtx) -> Widget {
Line("Keep delay at all intersections").fg(Color::BLACK), Line("Keep delay at all intersections").fg(Color::BLACK),
Line(format!("under {}", THRESHOLD)).fg(Color::BLACK), Line(format!("under {}", THRESHOLD)).fg(Color::BLACK),
]) ])
.draw(ctx), .into_widget(ctx),
]), ]),
Widget::col(vec![ Widget::col(vec![
Line("Score").fg(Color::BLACK).draw(ctx), Line("Score").fg(Color::BLACK).into_widget(ctx),
Image::icon("system/assets/tools/star.svg") Image::icon("system/assets/tools/star.svg")
.color(Color::BLACK) .color(Color::BLACK)
.into_widget(ctx), .into_widget(ctx),
Line("How long you survive").fg(Color::BLACK).draw(ctx), Line("How long you survive")
.fg(Color::BLACK)
.into_widget(ctx),
]), ]),
]) ])
.evenly_spaced(), .evenly_spaced(),

16
game/src/sandbox/gameplay/freeform.rs
View File

@ -120,7 +120,10 @@ impl GameplayState for Freeform {
fn recreate_panels(&mut self, ctx: &mut EventCtx, app: &App) { fn recreate_panels(&mut self, ctx: &mut EventCtx, app: &App) {
let rows = vec![ let rows = vec![
Widget::custom_row(vec![ Widget::custom_row(vec![
Line("Sandbox").small_heading().draw(ctx).margin_right(18), Line("Sandbox")
.small_heading()
.into_widget(ctx)
.margin_right(18),
ctx.style() ctx.style()
.btn_popup_icon_text( .btn_popup_icon_text(
"system/assets/tools/map.svg", "system/assets/tools/map.svg",
@ -158,7 +161,7 @@ impl GameplayState for Freeform {
Key::Z.txt(ctx), Key::Z.txt(ctx),
Line(" to start traffic nearby"), Line(" to start traffic nearby"),
]) ])
.draw(ctx), .into_widget(ctx),
]; ];
self.top_center = Panel::new(Widget::col(rows)) self.top_center = Panel::new(Widget::col(rows))
@ -221,10 +224,11 @@ impl ChangeScenario {
let mut col = vec![ let mut col = vec![
Widget::row(vec![ Widget::row(vec![
Line("Pick your scenario").small_heading().draw(ctx), Line("Pick your scenario").small_heading().into_widget(ctx),
ctx.style().btn_close_widget(ctx), ctx.style().btn_close_widget(ctx),
]), ]),
Line("Each scenario determines what people live and travel around this map").draw(ctx), Line("Each scenario determines what people live and travel around this map")
.into_widget(ctx),
]; ];
for (name, label, description) in choices { for (name, label, description) in choices {
let btn = ctx let btn = ctx
@ -237,7 +241,7 @@ impl ChangeScenario {
btn.build_widget(ctx, &name), btn.build_widget(ctx, &name),
Text::from(Line(description).secondary()) Text::from(Line(description).secondary())
.wrap_to_pct(ctx, 40) .wrap_to_pct(ctx, 40)
.draw(ctx) .into_widget(ctx)
.align_right(), .align_right(),
]) ])
.margin_above(30), .margin_above(30),
@ -305,7 +309,7 @@ impl AgentSpawner {
confirmed: false, confirmed: false,
panel: Panel::new(Widget::col(vec![ panel: Panel::new(Widget::col(vec![
Widget::row(vec![ Widget::row(vec![
Line("New trip").small_heading().draw(ctx), Line("New trip").small_heading().into_widget(ctx),
ctx.style().btn_close_widget(ctx), ctx.style().btn_close_widget(ctx),
]), ]),
"Click a building or border to specify start" "Click a building or border to specify start"

2
game/src/sandbox/gameplay/mod.rs
View File

@ -235,7 +235,7 @@ impl GameplayMode {
fn challenge_header(ctx: &mut EventCtx, title: &str) -> Widget { fn challenge_header(ctx: &mut EventCtx, title: &str) -> Widget {
Widget::row(vec![ Widget::row(vec![
Line(title).small_heading().draw(ctx).centered_vert(), Line(title).small_heading().into_widget(ctx).centered_vert(),
ctx.style() ctx.style()
.btn_plain .btn_plain
.icon("system/assets/tools/info.svg") .icon("system/assets/tools/info.svg")

13
game/src/sandbox/gameplay/play_scenario.rs
View File

@ -127,7 +127,10 @@ impl GameplayState for PlayScenario {
fn recreate_panels(&mut self, ctx: &mut EventCtx, app: &App) { fn recreate_panels(&mut self, ctx: &mut EventCtx, app: &App) {
let rows = vec![ let rows = vec![
Widget::custom_row(vec![ Widget::custom_row(vec![
Line("Sandbox").small_heading().draw(ctx).margin_right(18), Line("Sandbox")
.small_heading()
.into_widget(ctx)
.margin_right(18),
ctx.style() ctx.style()
.btn_popup_icon_text( .btn_popup_icon_text(
"system/assets/tools/map.svg", "system/assets/tools/map.svg",
@ -185,7 +188,9 @@ impl EditScenarioModifiers {
modifiers: Vec<ScenarioModifier>, modifiers: Vec<ScenarioModifier>,
) -> Box<dyn State<App>> { ) -> Box<dyn State<App>> {
let mut rows = vec![ let mut rows = vec![
Line("Modify traffic patterns").small_heading().draw(ctx), Line("Modify traffic patterns")
.small_heading()
.into_widget(ctx),
Text::from_multiline(vec![ Text::from_multiline(vec![
Line( Line(
"Data for all of the people in this simulation comes from PSRC's 2014 \ "Data for all of the people in this simulation comes from PSRC's 2014 \
@ -196,7 +201,7 @@ impl EditScenarioModifiers {
Line("You can modify those patterns here. The modifications apply in order."), Line("You can modify those patterns here. The modifications apply in order."),
]) ])
.wrap_to_pct(ctx, 50) .wrap_to_pct(ctx, 50)
.draw(ctx), .into_widget(ctx),
]; ];
for (idx, m) in modifiers.iter().enumerate() { for (idx, m) in modifiers.iter().enumerate() {
rows.push( rows.push(
@ -369,7 +374,7 @@ impl ChangeMode {
scenario_name, scenario_name,
modifiers, modifiers,
panel: Panel::new(Widget::col(vec![ panel: Panel::new(Widget::col(vec![
Line("Change trip mode").small_heading().draw(ctx), Line("Change trip mode").small_heading().into_widget(ctx),
Widget::row(vec![ Widget::row(vec![
"Percent of people to modify:" "Percent of people to modify:"
.text_widget(ctx) .text_widget(ctx)

12
game/src/sandbox/gameplay/tutorial.rs
View File

@ -735,7 +735,7 @@ impl TutorialState {
fn make_top_center(&self, ctx: &mut EventCtx, edit_map: bool) -> Panel { fn make_top_center(&self, ctx: &mut EventCtx, edit_map: bool) -> Panel {
let mut col = vec![Widget::row(vec![ let mut col = vec![Widget::row(vec![
Line("Tutorial").small_heading().draw(ctx), Line("Tutorial").small_heading().into_widget(ctx),
Widget::vert_separator(ctx, 50.0), Widget::vert_separator(ctx, 50.0),
ctx.style() ctx.style()
.btn_prev() .btn_prev()
@ -745,7 +745,7 @@ impl TutorialState {
let mut txt = Text::from(Line(format!("Task {}", self.current.stage + 1))); let mut txt = Text::from(Line(format!("Task {}", self.current.stage + 1)));
// TODO Smaller font and use alpha for the "/9" part // TODO Smaller font and use alpha for the "/9" part
txt.append(Line(format!("/{}", self.stages.len())).fg(Color::grey(0.7))); txt.append(Line(format!("/{}", self.stages.len())).fg(Color::grey(0.7)));
txt.draw(ctx) txt.into_widget(ctx)
}, },
ctx.style() ctx.style()
.btn_next() .btn_next()
@ -766,7 +766,7 @@ impl TutorialState {
)) ))
.small_heading(), .small_heading(),
) )
.draw(ctx), .into_widget(ctx),
// TODO also text saying "instructions"... can we layout two things easily to // TODO also text saying "instructions"... can we layout two things easily to
// make a button? // make a button?
ctx.style() ctx.style()
@ -776,7 +776,7 @@ impl TutorialState {
.centered_vert() .centered_vert()
.align_right(), .align_right(),
])); ]));
col.push(task.top_txt(self).draw(ctx)); col.push(task.top_txt(self).into_widget(ctx));
} }
} }
if edit_map { if edit_map {
@ -826,7 +826,7 @@ impl TutorialState {
for l in lines { for l in lines {
txt.add(Line(l)); txt.add(Line(l));
} }
txt.wrap_to_pct(ctx, 30).draw(ctx) txt.wrap_to_pct(ctx, 30).into_widget(ctx)
}]; }];
let mut controls = vec![Widget::row(vec![ let mut controls = vec![Widget::row(vec![
ctx.style() ctx.style()
@ -1415,7 +1415,7 @@ fn intro_story(ctx: &mut EventCtx) -> Box<dyn State<App>> {
ctx, ctx,
Box::new(|ctx| { Box::new(|ctx| {
Text::from(Line("Use the tutorial to learn the basic controls.").fg(Color::BLACK)) Text::from(Line("Use the tutorial to learn the basic controls.").fg(Color::BLACK))
.draw(ctx) .into_widget(ctx)
}), }),
) )
} }

2
game/src/sandbox/misc_tools.rs
View File

@ -84,7 +84,7 @@ impl TrafficRecorder {
Widget::row(vec![ Widget::row(vec![
Line("Select the bounding intersections for recording traffic") Line("Select the bounding intersections for recording traffic")
.small_heading() .small_heading()
.draw(ctx), .into_widget(ctx),
ctx.style().btn_close_widget(ctx), ctx.style().btn_close_widget(ctx),
]), ]),
make_btn(ctx, members.len()), make_btn(ctx, members.len()),

2
game/src/sandbox/mod.rs
View File

@ -414,7 +414,7 @@ impl AgentMeter {
prettyprint_usize(finished), prettyprint_usize(finished),
pct as usize pct as usize
))); )));
txt.draw(ctx).centered_vert() txt.into_widget(ctx).centered_vert()
}, },
if app.primary.dirty_from_edits { if app.primary.dirty_from_edits {
ctx.style() ctx.style()

8
game/src/sandbox/speed.rs
View File

@ -368,7 +368,7 @@ impl TimePanel {
time: app.primary.sim.time(), time: app.primary.sim.time(),
panel: Panel::new(Widget::col(vec![ panel: Panel::new(Widget::col(vec![
Text::from(Line(app.primary.sim.time().ampm_tostring()).big_monospaced()) Text::from(Line(app.primary.sim.time().ampm_tostring()).big_monospaced())
.draw(ctx) .into_widget(ctx)
.centered_horiz(), .centered_horiz(),
{ {
let mut batch = GeomBatch::new(); let mut batch = GeomBatch::new();
@ -404,11 +404,11 @@ impl TimePanel {
batch.into_widget(ctx) batch.into_widget(ctx)
}, },
Widget::custom_row(vec![ Widget::custom_row(vec![
Line("00:00").small_monospaced().draw(ctx), Line("00:00").small_monospaced().into_widget(ctx),
Image::icon("system/assets/speed/sunrise.svg").into_widget(ctx), Image::icon("system/assets/speed/sunrise.svg").into_widget(ctx),
Line("12:00").small_monospaced().draw(ctx), Line("12:00").small_monospaced().into_widget(ctx),
Image::icon("system/assets/speed/sunset.svg").into_widget(ctx), Image::icon("system/assets/speed/sunset.svg").into_widget(ctx),
Line("24:00").small_monospaced().draw(ctx), Line("24:00").small_monospaced().into_widget(ctx),
]) ])
.evenly_spaced(), .evenly_spaced(),
])) ]))

10
game/src/sandbox/time_warp.rs
View File

@ -47,7 +47,7 @@ impl JumpToTime {
.build_def(ctx), .build_def(ctx),
]) ])
.bg(Color::WHITE), .bg(Color::WHITE),
Line("Jump to what time?").small_heading().draw(ctx), Line("Jump to what time?").small_heading().into_widget(ctx),
if app.has_prebaked().is_some() { if app.has_prebaked().is_some() {
GeomBatch::from(vec![( GeomBatch::from(vec![(
Color::WHITE.alpha(0.7), Color::WHITE.alpha(0.7),
@ -182,7 +182,7 @@ impl JumpToDelay {
]) ])
.bg(Color::WHITE), .bg(Color::WHITE),
Widget::row(vec![ Widget::row(vec![
Line("Jump to next").small_heading().draw(ctx), Line("Jump to next").small_heading().into_widget(ctx),
Widget::dropdown( Widget::dropdown(
ctx, ctx,
"delay", "delay",
@ -194,7 +194,7 @@ impl JumpToDelay {
Choice::new("10", Duration::minutes(10)), Choice::new("10", Duration::minutes(10)),
], ],
), ),
Line("minute delay").small_heading().draw(ctx), Line("minute delay").small_heading().into_widget(ctx),
]), ]),
Toggle::checkbox( Toggle::checkbox(
ctx, ctx,
@ -295,7 +295,7 @@ impl TimeWarpScreen {
halt_upon_delay, halt_upon_delay,
panel: Panel::new( panel: Panel::new(
Widget::col(vec![ Widget::col(vec![
Text::new().draw(ctx).named("text"), Text::new().into_widget(ctx).named("text"),
ctx.style() ctx.style()
.btn_outline .btn_outline
.text("stop now") .text("stop now")
@ -392,7 +392,7 @@ impl State<App> for TimeWarpScreen {
}, },
]); ]);
self.panel.replace(ctx, "text", txt.draw(ctx)); self.panel.replace(ctx, "text", txt.into_widget(ctx));
} }
// >= because of the case of resetting to midnight. GameplayMode::initialize takes a tiny // >= because of the case of resetting to midnight. GameplayMode::initialize takes a tiny
// step past midnight after spawning things, so that agents initially appear on the map. // step past midnight after spawning things, so that agents initially appear on the map.

4
map_editor/src/edit.rs
View File

@ -28,7 +28,7 @@ impl EditRoad {
for (k, v) in road.osm_tags.inner() { for (k, v) in road.osm_tags.inner() {
txt.add(Line(format!("{} = {}", k, v)).secondary()); txt.add(Line(format!("{} = {}", k, v)).secondary());
} }
let info = txt.draw(ctx); let info = txt.into_widget(ctx);
let controls = Widget::col(vec![ let controls = Widget::col(vec![
Widget::row(vec![ Widget::row(vec![
@ -103,7 +103,7 @@ impl EditRoad {
let col = vec![ let col = vec![
Widget::row(vec![ Widget::row(vec![
Line("Editing road").small_heading().draw(ctx), Line("Editing road").small_heading().into_widget(ctx),
ctx.style().btn_close_widget(ctx), ctx.style().btn_close_widget(ctx),
]), ]),
Widget::row(vec![info, controls]), Widget::row(vec![info, controls]),

18
map_editor/src/main.rs
View File

@ -104,10 +104,10 @@ impl MainState {
mode: Mode::Viewing, mode: Mode::Viewing,
panel: Panel::new(Widget::col(vec![ panel: Panel::new(Widget::col(vec![
Widget::row(vec![ Widget::row(vec![
Line("Map Editor").small_heading().draw(ctx), Line("Map Editor").small_heading().into_widget(ctx),
ctx.style().btn_close_widget(ctx), ctx.style().btn_close_widget(ctx),
]), ]),
Text::new().draw(ctx).named("instructions"), Text::new().into_widget(ctx).named("instructions"),
Widget::col(vec![ Widget::col(vec![
Toggle::switch(ctx, "intersection geometry", Key::G, false), Toggle::switch(ctx, "intersection geometry", Key::G, false),
ctx.style() ctx.style()
@ -206,7 +206,7 @@ impl State<App> for MainState {
Key::T.txt(ctx), Key::T.txt(ctx),
Line(" to toggle stop sign / traffic signal"), Line(" to toggle stop sign / traffic signal"),
]); ]);
let instructions = txt.draw(ctx); let instructions = txt.into_widget(ctx);
self.panel.replace(ctx, "instructions", instructions); self.panel.replace(ctx, "instructions", instructions);
} }
Some(ID::Building(b)) => { Some(ID::Building(b)) => {
@ -228,7 +228,7 @@ impl State<App> for MainState {
Key::LeftControl.txt(ctx), Key::LeftControl.txt(ctx),
Line(" to move"), Line(" to move"),
]); ]);
let instructions = txt.draw(ctx); let instructions = txt.into_widget(ctx);
self.panel.replace(ctx, "instructions", instructions); self.panel.replace(ctx, "instructions", instructions);
} }
Some(ID::Road(r)) => { Some(ID::Road(r)) => {
@ -273,7 +273,7 @@ impl State<App> for MainState {
Key::M.txt(ctx), Key::M.txt(ctx),
Line(" to merge"), Line(" to merge"),
]); ]);
let instructions = txt.draw(ctx); let instructions = txt.into_widget(ctx);
self.panel.replace(ctx, "instructions", instructions); self.panel.replace(ctx, "instructions", instructions);
} }
Some(ID::RoadPoint(r, idx)) => { Some(ID::RoadPoint(r, idx)) => {
@ -295,7 +295,7 @@ impl State<App> for MainState {
Key::LeftControl.txt(ctx), Key::LeftControl.txt(ctx),
Line(" to move"), Line(" to move"),
]); ]);
let instructions = txt.draw(ctx); let instructions = txt.into_widget(ctx);
self.panel.replace(ctx, "instructions", instructions); self.panel.replace(ctx, "instructions", instructions);
} }
None => { None => {
@ -348,7 +348,7 @@ impl State<App> for MainState {
Key::B.txt(ctx), Key::B.txt(ctx),
Line(" to create a building"), Line(" to create a building"),
]); ]);
let instructions = txt.draw(ctx); let instructions = txt.into_widget(ctx);
self.panel.replace(ctx, "instructions", instructions); self.panel.replace(ctx, "instructions", instructions);
} }
} }
@ -397,7 +397,7 @@ impl State<App> for MainState {
Line("Click").fg(ctx.style().text_hotkey_color), Line("Click").fg(ctx.style().text_hotkey_color),
Line(" the top-left corner of this map"), Line(" the top-left corner of this map"),
]); ]);
let instructions = txt.draw(ctx); let instructions = txt.into_widget(ctx);
self.panel.replace(ctx, "instructions", instructions); self.panel.replace(ctx, "instructions", instructions);
if let Some(pt) = cursor { if let Some(pt) = cursor {
@ -412,7 +412,7 @@ impl State<App> for MainState {
Line("Click").fg(ctx.style().text_hotkey_color), Line("Click").fg(ctx.style().text_hotkey_color),
Line(" the bottom-right corner of this map"), Line(" the bottom-right corner of this map"),
]); ]);
let instructions = txt.draw(ctx); let instructions = txt.into_widget(ctx);
self.panel.replace(ctx, "instructions", instructions); self.panel.replace(ctx, "instructions", instructions);
if let Some(pt2) = cursor { if let Some(pt2) = cursor {

2
map_gui/src/options.rs
View File

@ -128,7 +128,7 @@ impl OptionsPanel {
Box::new(OptionsPanel { Box::new(OptionsPanel {
panel: Panel::new(Widget::col(vec![ panel: Panel::new(Widget::col(vec![
Widget::custom_row(vec![ Widget::custom_row(vec![
Line("Settings").small_heading().draw(ctx), Line("Settings").small_heading().into_widget(ctx),
ctx.style().btn_close_widget(ctx), ctx.style().btn_close_widget(ctx),
]), ]),
"Camera controls".text_widget(ctx), "Camera controls".text_widget(ctx),

8
map_gui/src/tools/city_picker.rs
View File

@ -104,7 +104,7 @@ impl<A: AppLike + 'static> CityPicker<A> {
} }
} }
let mut other_places = vec![Line("Other places").draw(ctx)]; let mut other_places = vec![Line("Other places").into_widget(ctx)];
for (country, cities) in cities_per_country() { for (country, cities) in cities_per_country() {
// If there's only one city and we're already there, skip it. // If there's only one city and we're already there, skip it.
if cities.len() == 1 && cities[0] == city_name { if cities.len() == 1 && cities[0] == city_name {
@ -150,7 +150,7 @@ impl<A: AppLike + 'static> CityPicker<A> {
on_load: Some(on_load), on_load: Some(on_load),
panel: Panel::new(Widget::col(vec![ panel: Panel::new(Widget::col(vec![
Widget::row(vec![ Widget::row(vec![
Line("Select a district").small_heading().draw(ctx), Line("Select a district").small_heading().into_widget(ctx),
ctx.style().btn_close_widget(ctx), ctx.style().btn_close_widget(ctx),
]), ]),
Widget::row(vec![ Widget::row(vec![
@ -357,7 +357,7 @@ impl<A: AppLike + 'static> AllCityPicker<A> {
on_load: Some(on_load), on_load: Some(on_load),
panel: Panel::new(Widget::col(vec![ panel: Panel::new(Widget::col(vec![
Widget::row(vec![ Widget::row(vec![
Line("Select a district").small_heading().draw(ctx), Line("Select a district").small_heading().into_widget(ctx),
ctx.style().btn_close_widget(ctx), ctx.style().btn_close_widget(ctx),
]), ]),
Widget::row(vec![ Widget::row(vec![
@ -459,7 +459,7 @@ impl<A: AppLike + 'static> CitiesInCountryPicker<A> {
draw_flag, draw_flag,
Line(format!("Select a city in {}", nice_country_name(country))) Line(format!("Select a city in {}", nice_country_name(country)))
.small_heading() .small_heading()
.draw(ctx), .into_widget(ctx),
ctx.style().btn_close_widget(ctx), ctx.style().btn_close_widget(ctx),
]), ]),
Widget::custom_row(buttons).flex_wrap(ctx, Percent::int(70)), Widget::custom_row(buttons).flex_wrap(ctx, Percent::int(70)),

8
map_gui/src/tools/colors.rs
View File

@ -109,7 +109,9 @@ impl ColorLegend {
)]) )])
.into_widget(ctx) .into_widget(ctx)
.centered_vert(), .centered_vert(),
Text::from(Line(label)).wrap_to_pct(ctx, 35).draw(ctx), Text::from(Line(label))
.wrap_to_pct(ctx, 35)
.into_widget(ctx),
]) ])
} }
@ -148,7 +150,7 @@ impl ColorLegend {
Widget::custom_row( Widget::custom_row(
labels labels
.into_iter() .into_iter()
.map(|lbl| Line(lbl).small().draw(ctx)) .map(|lbl| Line(lbl).small().into_widget(ctx))
.collect(), .collect(),
) )
.evenly_spaced(), .evenly_spaced(),
@ -175,7 +177,7 @@ impl ColorLegend {
Widget::custom_row( Widget::custom_row(
pairs pairs
.into_iter() .into_iter()
.map(|(_, lbl)| Line(lbl).small().draw(ctx)) .map(|(_, lbl)| Line(lbl).small().into_widget(ctx))
.collect(), .collect(),
) )
.evenly_spaced(), .evenly_spaced(),

2
map_gui/src/tools/minimap.rs
View File

@ -146,7 +146,7 @@ impl<A: AppLike + 'static, T: MinimapControls<A>> Minimap<A, T> {
.bg(app.cs().inner_panel_bg), .bg(app.cs().inner_panel_bg),
if self.controls.has_zorder(app) { if self.controls.has_zorder(app) {
Widget::col(vec![ Widget::col(vec![
Line("Z-order:").small().draw(ctx), Line("Z-order:").small().into_widget(ctx),
Spinner::widget( Spinner::widget(
ctx, ctx,
app.draw_map().zorder_range, app.draw_map().zorder_range,

6
map_gui/src/tools/navigate.rs
View File

@ -19,7 +19,7 @@ impl Navigator {
Box::new(Navigator { Box::new(Navigator {
panel: Panel::new(Widget::col(vec![ panel: Panel::new(Widget::col(vec![
Widget::row(vec![ Widget::row(vec![
Line("Enter a street name").small_heading().draw(ctx), Line("Enter a street name").small_heading().into_widget(ctx),
ctx.style().btn_close_widget(ctx), ctx.style().btn_close_widget(ctx),
]), ]),
Autocomplete::new( Autocomplete::new(
@ -115,7 +115,7 @@ impl CrossStreet {
"(Or just quit to go to {})", "(Or just quit to go to {})",
map.get_r(first[0]).get_name(app.opts().language.as_ref()), map.get_r(first[0]).get_name(app.opts().language.as_ref()),
))); )));
txt.draw(ctx) txt.into_widget(ctx)
}, },
ctx.style().btn_close_widget(ctx), ctx.style().btn_close_widget(ctx),
]), ]),
@ -205,7 +205,7 @@ impl SearchBuildings {
Widget::row(vec![ Widget::row(vec![
Line("Enter a business name or address") Line("Enter a business name or address")
.small_heading() .small_heading()
.draw(ctx), .into_widget(ctx),
ctx.style().btn_close_widget(ctx), ctx.style().btn_close_widget(ctx),
]), ]),
Autocomplete::new( Autocomplete::new(

4
map_gui/src/tools/turn_explorer.rs
View File

@ -117,7 +117,7 @@ impl TurnExplorer {
)) ))
.small_heading(), .small_heading(),
) )
.draw(ctx), .into_widget(ctx),
Widget::vert_separator(ctx, 50.0), Widget::vert_separator(ctx, 50.0),
ctx.style() ctx.style()
.btn_prev() .btn_prev()
@ -125,7 +125,7 @@ impl TurnExplorer {
.hotkey(Key::LeftArrow) .hotkey(Key::LeftArrow)
.build_widget(ctx, "previous turn"), .build_widget(ctx, "previous turn"),
Text::from(Line(format!("{}/{}", idx, turns.len())).secondary()) Text::from(Line(format!("{}/{}", idx, turns.len())).secondary())
.draw(ctx) .into_widget(ctx)
.centered_vert(), .centered_vert(),
ctx.style() ctx.style()
.btn_next() .btn_next()

6
map_gui/src/tools/ui.rs
View File

@ -24,7 +24,7 @@ impl<A: AppLike + 'static, T: 'static> ChooseSomething<A, T> {
Box::new(ChooseSomething { Box::new(ChooseSomething {
panel: Panel::new(Widget::col(vec![ panel: Panel::new(Widget::col(vec![
Widget::row(vec![ Widget::row(vec![
Line(query).small_heading().draw(ctx), Line(query).small_heading().into_widget(ctx),
ctx.style().btn_close_widget(ctx), ctx.style().btn_close_widget(ctx),
]), ]),
Menu::widget(ctx, choices).named("menu"), Menu::widget(ctx, choices).named("menu"),
@ -79,7 +79,7 @@ impl<A: AppLike + 'static> PromptInput<A> {
Box::new(PromptInput { Box::new(PromptInput {
panel: Panel::new(Widget::col(vec![ panel: Panel::new(Widget::col(vec![
Widget::row(vec![ Widget::row(vec![
Line(query).small_heading().draw(ctx), Line(query).small_heading().into_widget(ctx),
ctx.style().btn_close_widget(ctx), ctx.style().btn_close_widget(ctx),
]), ]),
Widget::text_entry(ctx, String::new(), true).named("input"), Widget::text_entry(ctx, String::new(), true).named("input"),
@ -161,7 +161,7 @@ impl PopupMsg {
} }
Box::new(PopupMsg { Box::new(PopupMsg {
panel: Panel::new(Widget::col(vec![ panel: Panel::new(Widget::col(vec![
txt.draw(ctx), txt.into_widget(ctx),
ctx.style() ctx.style()
.btn_solid_primary .btn_solid_primary
.text("OK") .text("OK")

6
map_gui/src/tools/updater.rs
View File

@ -30,7 +30,9 @@ impl<A: AppLike + 'static> Picker<A> {
let mut col = vec![ let mut col = vec![
Widget::row(vec![ Widget::row(vec![
Line("Download more cities").small_heading().draw(ctx), Line("Download more cities")
.small_heading()
.into_widget(ctx),
ctx.style().btn_close_widget(ctx), ctx.style().btn_close_widget(ctx),
]), ]),
"Select the cities you want to include".text_widget(ctx), "Select the cities you want to include".text_widget(ctx),
@ -39,7 +41,7 @@ impl<A: AppLike + 'static> Picker<A> {
will be larger", will be larger",
) )
.secondary() .secondary()
.draw(ctx), .into_widget(ctx),
]; ];
for (city, bytes) in size_per_city(&manifest) { for (city, bytes) in size_per_city(&manifest) {
col.push(Widget::row(vec![ col.push(Widget::row(vec![

10
osm_viewer/src/viewer.rs
View File

@ -56,7 +56,9 @@ impl Viewer {
biz_search_panel: Option<Widget>, biz_search_panel: Option<Widget>,
) { ) {
let top_panel = Panel::new(Widget::col(vec![ let top_panel = Panel::new(Widget::col(vec![
Line("OpenStreetMap viewer").small_heading().draw(ctx), Line("OpenStreetMap viewer")
.small_heading()
.into_widget(ctx),
ctx.style() ctx.style()
.btn_popup_icon_text( .btn_popup_icon_text(
"system/assets/tools/map.svg", "system/assets/tools/map.svg",
@ -142,7 +144,7 @@ impl Viewer {
ctx, ctx,
&format!("open https://wiki.openstreetmap.org/wiki/Key:{}", k), &format!("open https://wiki.openstreetmap.org/wiki/Key:{}", k),
), ),
Line(v).draw(ctx).align_right(), Line(v).into_widget(ctx).align_right(),
])); ]));
} }
} }
@ -187,7 +189,7 @@ impl Viewer {
))); )));
} }
} }
col.push(txt.draw(ctx)); col.push(txt.into_widget(ctx));
if !b.osm_tags.is_empty() { if !b.osm_tags.is_empty() {
for (k, v) in b.osm_tags.inner() { for (k, v) in b.osm_tags.inner() {
@ -199,7 +201,7 @@ impl Viewer {
ctx, ctx,
&format!("open https://wiki.openstreetmap.org/wiki/Key:{}", k), &format!("open https://wiki.openstreetmap.org/wiki/Key:{}", k),
), ),
Line(v).draw(ctx).align_right(), Line(v).into_widget(ctx).align_right(),
])); ]));
} }
} }

6
parking_mapper/src/mapper.rs
View File

@ -127,7 +127,7 @@ impl ParkingMapper {
draw_layer: ctx.upload(batch), draw_layer: ctx.upload(batch),
show, show,
panel: Panel::new(Widget::col(vec![ panel: Panel::new(Widget::col(vec![
Line("Parking mapper").small_heading().draw(ctx), Line("Parking mapper").small_heading().into_widget(ctx),
ctx.style() ctx.style()
.btn_popup_icon_text( .btn_popup_icon_text(
"system/assets/tools/map.svg", "system/assets/tools/map.svg",
@ -260,7 +260,7 @@ impl State<App> for ParkingMapper {
txt.add(Line(format!("{} = {}", k, v)).secondary()); txt.add(Line(format!("{} = {}", k, v)).secondary());
} }
} }
self.panel.replace(ctx, "info", txt.draw(ctx)); self.panel.replace(ctx, "info", txt.into_widget(ctx));
} }
} else if self.selected.is_some() { } else if self.selected.is_some() {
self.selected = None; self.selected = None;
@ -423,7 +423,7 @@ impl ChangeWay {
Widget::row(vec![ Widget::row(vec![
Line("What kind of parking does this road have?") Line("What kind of parking does this road have?")
.small_heading() .small_heading()
.draw(ctx), .into_widget(ctx),
ctx.style().btn_close_widget(ctx), ctx.style().btn_close_widget(ctx),
]), ]),
Menu::widget( Menu::widget(

4
santa/src/after_level.rs
View File

@ -94,7 +94,7 @@ impl Strategize {
batch.push(Color::CYAN, path.render(Distance::meters(2.0))); batch.push(Color::CYAN, path.render(Distance::meters(2.0)));
let panel = Panel::new(Widget::col(vec![ let panel = Panel::new(Widget::col(vec![
txt.draw(ctx), txt.into_widget(ctx),
ctx.style() ctx.style()
.btn_outline .btn_outline
.text("Back to title screen") .text("Back to title screen")
@ -196,7 +196,7 @@ impl Results {
SimpleState::new( SimpleState::new(
Panel::new(Widget::col(vec![ Panel::new(Widget::col(vec![
txt.draw(ctx), txt.into_widget(ctx),
ctx.style() ctx.style()
.btn_solid_primary .btn_solid_primary
.text("OK") .text("OK")

18
santa/src/before_level.rs
View File

@ -73,7 +73,7 @@ impl Picker {
]); ]);
let instructions_panel = Panel::new(Widget::col(vec![ let instructions_panel = Panel::new(Widget::col(vec![
txt.draw(ctx), txt.into_widget(ctx),
Widget::row(vec![ Widget::row(vec![
GeomBatch::load_svg_bytes( GeomBatch::load_svg_bytes(
&ctx.prerender, &ctx.prerender,
@ -86,7 +86,7 @@ impl Picker {
Line("WASD").fg(ctx.style().text_hotkey_color), Line("WASD").fg(ctx.style().text_hotkey_color),
Line(")"), Line(")"),
]) ])
.draw(ctx), .into_widget(ctx),
]), ]),
Widget::row(vec![ Widget::row(vec![
Image::icon("system/assets/tools/mouse.svg").into_widget(ctx), Image::icon("system/assets/tools/mouse.svg").into_widget(ctx),
@ -95,13 +95,13 @@ impl Picker {
.fg(ctx.style().text_hotkey_color), .fg(ctx.style().text_hotkey_color),
Line(" to zoom in or out"), Line(" to zoom in or out"),
]) ])
.draw(ctx), .into_widget(ctx),
]), ]),
Text::from_all(vec![ Text::from_all(vec![
Line("Escape key").fg(ctx.style().text_hotkey_color), Line("Escape key").fg(ctx.style().text_hotkey_color),
Line(" to pause"), Line(" to pause"),
]) ])
.draw(ctx), .into_widget(ctx),
])) ]))
.aligned(HorizontalAlignment::LeftInset, VerticalAlignment::TopInset) .aligned(HorizontalAlignment::LeftInset, VerticalAlignment::TopInset)
.build(ctx); .build(ctx);
@ -273,9 +273,11 @@ fn make_vehicle_panel(ctx: &mut EventCtx, app: &App) -> Panel {
let (max_speed, max_energy) = Vehicle::max_stats(); let (max_speed, max_energy) = Vehicle::max_stats();
Panel::new(Widget::col(vec![ Panel::new(Widget::col(vec![
Line("Pick Santa's vehicle").small_heading().draw(ctx), Line("Pick Santa's vehicle")
.small_heading()
.into_widget(ctx),
Widget::row(buttons), Widget::row(buttons),
Line(&vehicle.name).small_heading().draw(ctx), Line(&vehicle.name).small_heading().into_widget(ctx),
Widget::row(vec![ Widget::row(vec![
"Speed:".text_widget(ctx), "Speed:".text_widget(ctx),
custom_bar( custom_bar(
@ -321,7 +323,7 @@ fn make_upzone_panel(ctx: &mut EventCtx, app: &App, num_picked: usize) -> Panel
Panel::new(Widget::col(vec![ Panel::new(Widget::col(vec![
Widget::row(vec![ Widget::row(vec![
Line("Upzoning").small_heading().draw(ctx), Line("Upzoning").small_heading().into_widget(ctx),
ctx.style() ctx.style()
.btn_plain .btn_plain
.icon("system/assets/tools/info.svg") .icon("system/assets/tools/info.svg")
@ -332,7 +334,7 @@ fn make_upzone_panel(ctx: &mut EventCtx, app: &App, num_picked: usize) -> Panel
Image::icon("system/assets/tools/mouse.svg").into_widget(ctx), Image::icon("system/assets/tools/mouse.svg").into_widget(ctx),
Line("Select the houses you want to turn into stores") Line("Select the houses you want to turn into stores")
.fg(ctx.style().text_hotkey_color) .fg(ctx.style().text_hotkey_color)
.draw(ctx), .into_widget(ctx),
]), ]),
Widget::row(vec![ Widget::row(vec![
"Upzones chosen:".text_widget(ctx), "Upzones chosen:".text_widget(ctx),

6
santa/src/game.rs
View File

@ -55,7 +55,7 @@ impl Game {
Image::icon("system/assets/tools/map.svg") Image::icon("system/assets/tools/map.svg")
.into_widget(ctx) .into_widget(ctx)
.centered_vert(), .centered_vert(),
Line(&level.title).draw(ctx), Line(&level.title).into_widget(ctx),
]) ])
.padding(10) .padding(10)
.bg(Color::hex("#003046")), .bg(Color::hex("#003046")),
@ -128,7 +128,7 @@ impl Game {
)) ))
.small_heading() .small_heading()
.fg(text_color) .fg(text_color)
.draw(ctx) .into_widget(ctx)
.centered_vert(); .centered_vert();
self.time_panel.replace(ctx, "time label", label); self.time_panel.replace(ctx, "time label", label);
@ -301,7 +301,7 @@ impl Game {
let label = Text::from( let label = Text::from(
Line("SANTA'S HANGRY - grab some cookies from a store!").fg(Color::RED), Line("SANTA'S HANGRY - grab some cookies from a store!").fg(Color::RED),
) )
.draw(ctx); .into_widget(ctx);
self.status_panel.replace(ctx, "energy label", label); self.status_panel.replace(ctx, "energy label", label);
} }
self.state self.state

8
santa/src/title.rs
View File

@ -25,7 +25,7 @@ impl TitleScreen {
Panel::new(Widget::col(vec![ Panel::new(Widget::col(vec![
Line("15-minute Santa") Line("15-minute Santa")
.display_title() .display_title()
.draw(ctx) .into_widget(ctx)
.container() .container()
.padding(16) .padding(16)
.bg(app.cs.fade_map_dark) .bg(app.cs.fade_map_dark)
@ -41,7 +41,7 @@ impl TitleScreen {
.small_heading(), .small_heading(),
) )
.wrap_to_pct(ctx, 50) .wrap_to_pct(ctx, 50)
.draw(ctx) .into_widget(ctx)
.container() .container()
.padding(16) .padding(16)
.bg(app.cs.fade_map_dark) .bg(app.cs.fade_map_dark)
@ -147,7 +147,7 @@ impl Credits {
SimpleState::new( SimpleState::new(
Panel::new(Widget::col(vec![ Panel::new(Widget::col(vec![
Widget::row(vec![ Widget::row(vec![
Line("15-minute Santa").big_heading_plain().draw(ctx), Line("15-minute Santa").big_heading_plain().into_widget(ctx),
ctx.style().btn_close_widget(ctx), ctx.style().btn_close_widget(ctx),
]), ]),
link( link(
@ -159,7 +159,7 @@ impl Credits {
Line("Lead: Dustin Carlino"), Line("Lead: Dustin Carlino"),
Line("Programming & game design: Michael Kirk"), Line("Programming & game design: Michael Kirk"),
Line("UI/UX: Yuwen Li"), Line("UI/UX: Yuwen Li"),
]).draw(ctx), ]).into_widget(ctx),
link( link(
ctx, ctx,
"Santa made by @parallaxcreativedesign", "Santa made by @parallaxcreativedesign",

2
widgetry/src/event_ctx.rs
View File

@ -167,7 +167,7 @@ impl<'a> EventCtx<'a> {
.clone() .clone()
.default_fg(Color::WHITE) .default_fg(Color::WHITE)
.wrap_to_pct(self, 25) .wrap_to_pct(self, 25)
.draw(self) .into_widget(self)
.container() .container()
.bg(Color::BLACK) .bg(Color::BLACK)
.padding(15) .padding(15)

10
widgetry/src/text.rs
View File

@ -68,8 +68,8 @@ impl TextSpan {
self.fg_color.unwrap_or(style.text_fg_color) self.fg_color.unwrap_or(style.text_fg_color)
} }
pub fn draw(self, ctx: &EventCtx) -> Widget { pub fn into_widget(self, ctx: &EventCtx) -> Widget {
Text::from(self).draw(ctx) Text::from(self).into_widget(ctx)
} }
pub fn batch(self, ctx: &EventCtx) -> Widget { pub fn batch(self, ctx: &EventCtx) -> Widget {
Text::from(self).batch(ctx) Text::from(self).batch(ctx)
@ -370,7 +370,7 @@ impl Text {
format!("{:x}", hasher.finish()) format!("{:x}", hasher.finish())
} }
pub fn draw(self, ctx: &EventCtx) -> Widget { pub fn into_widget(self, ctx: &EventCtx) -> Widget {
JustDraw::wrap(ctx, self.render(ctx)) JustDraw::wrap(ctx, self.render(ctx))
} }
pub fn batch(self, ctx: &EventCtx) -> Widget { pub fn batch(self, ctx: &EventCtx) -> Widget {
@ -494,7 +494,7 @@ pub trait TextExt {
impl TextExt for &str { impl TextExt for &str {
fn text_widget(self, ctx: &EventCtx) -> Widget { fn text_widget(self, ctx: &EventCtx) -> Widget {
Line(self).draw(ctx) Line(self).into_widget(ctx)
} }
fn batch_text(self, ctx: &EventCtx) -> Widget { fn batch_text(self, ctx: &EventCtx) -> Widget {
Line(self).batch(ctx) Line(self).batch(ctx)
@ -503,7 +503,7 @@ impl TextExt for &str {
impl TextExt for String { impl TextExt for String {
fn text_widget(self, ctx: &EventCtx) -> Widget { fn text_widget(self, ctx: &EventCtx) -> Widget {
Line(self).draw(ctx) Line(self).into_widget(ctx)
} }
fn batch_text(self, ctx: &EventCtx) -> Widget { fn batch_text(self, ctx: &EventCtx) -> Widget {
Line(self).batch(ctx) Line(self).batch(ctx)

4
widgetry/src/widgets/compare_times.rs
View File

@ -96,7 +96,7 @@ impl CompareTimes {
labels labels
.iter() .iter()
.rev() .rev()
.map(|x| Line(x.to_string()).small().draw(ctx)) .map(|x| Line(x.to_string()).small().into_widget(ctx))
.collect(), .collect(),
) )
.evenly_spaced(); .evenly_spaced();
@ -111,7 +111,7 @@ impl CompareTimes {
let x_axis = Widget::custom_row( let x_axis = Widget::custom_row(
labels labels
.iter() .iter()
.map(|x| Line(x.to_string()).small().draw(ctx)) .map(|x| Line(x.to_string()).small().into_widget(ctx))
.collect(), .collect(),
) )
.evenly_spaced(); .evenly_spaced();

2
widgetry/src/widgets/table.rs
View File

@ -113,7 +113,7 @@ impl<A, T, F> Table<A, T, F> {
} else if let Col::Sortable(_) = col.col { } else if let Col::Sortable(_) = col.col {
ctx.style().btn_outline.text(&col.name).build_def(ctx) ctx.style().btn_outline.text(&col.name).build_def(ctx)
} else { } else {
Line(&col.name).draw(ctx).centered_vert() Line(&col.name).into_widget(ctx).centered_vert()
} }
}) })
.collect(); .collect();

24
widgetry_demo/src/lib.rs
View File

@ -50,17 +50,17 @@ impl Demo {
fn make_timeseries_panel(&self, ctx: &mut EventCtx) -> Panel { fn make_timeseries_panel(&self, ctx: &mut EventCtx) -> Panel {
// Make a table with 3 columns. // Make a table with 3 columns.
let mut col1 = vec![Line("Time").draw(ctx)]; let mut col1 = vec![Line("Time").into_widget(ctx)];
let mut col = vec![Line("Linear").draw(ctx)]; let mut col = vec![Line("Linear").into_widget(ctx)];
let mut col3 = vec![Line("Quadratic").draw(ctx)]; let mut col3 = vec![Line("Quadratic").into_widget(ctx)];
for s in 0..(self.elapsed.inner_seconds() as usize) { for s in 0..(self.elapsed.inner_seconds() as usize) {
col1.push( col1.push(
Line(format!("{}", Duration::seconds(s as f64))) Line(format!("{}", Duration::seconds(s as f64)))
.secondary() .secondary()
.draw(ctx), .into_widget(ctx),
); );
col.push(Line(s.to_string()).secondary().draw(ctx)); col.push(Line(s.to_string()).secondary().into_widget(ctx));
col3.push(Line(s.pow(2).to_string()).secondary().draw(ctx)); col3.push(Line(s.pow(2).to_string()).secondary().into_widget(ctx));
} }
let mut c = Panel::new(Widget::col(vec![ let mut c = Panel::new(Widget::col(vec![
@ -72,7 +72,7 @@ impl Demo {
) )
.fg(Color::RED), .fg(Color::RED),
]) ])
.draw(ctx), .into_widget(ctx),
Widget::row(vec![ Widget::row(vec![
// Examples of styling widgets // Examples of styling widgets
Widget::col(col1).outline((2.0, Color::BLACK)).padding(5), Widget::col(col1).outline((2.0, Color::BLACK)).padding(5),
@ -308,7 +308,7 @@ fn make_controls(ctx: &mut EventCtx) -> Panel {
Line("widgetry demo").big_heading_styled(), Line("widgetry demo").big_heading_styled(),
Line("Click and drag the background to pan, use touchpad or scroll wheel to zoom"), Line("Click and drag the background to pan, use touchpad or scroll wheel to zoom"),
]) ])
.draw(ctx), .into_widget(ctx),
Text::from_all(vec![ Text::from_all(vec![
Line("You can "), Line("You can "),
Line("change fonts ").big_heading_plain(), Line("change fonts ").big_heading_plain(),
@ -316,10 +316,10 @@ fn make_controls(ctx: &mut EventCtx) -> Panel {
Line("line!").small_heading(), Line("line!").small_heading(),
]) ])
.bg(Color::PURPLE) .bg(Color::PURPLE)
.draw(ctx), .into_widget(ctx),
// Button Style Gallery // Button Style Gallery
// TODO might be nice to have this in separate tabs or something. // TODO might be nice to have this in separate tabs or something.
Text::from(Line("Buttons").big_heading_styled().size(18)).draw(ctx), Text::from(Line("Buttons").big_heading_styled().size(18)).into_widget(ctx),
Widget::row(vec![Widget::col(vec![ Widget::row(vec![Widget::col(vec![
style style
.btn_solid_primary .btn_solid_primary
@ -358,7 +358,7 @@ fn make_controls(ctx: &mut EventCtx) -> Panel {
.icon_text("system/assets/tools/home.svg", "Secondary") .icon_text("system/assets/tools/home.svg", "Secondary")
.build_widget(ctx, "btn_outline.icon_text"), .build_widget(ctx, "btn_outline.icon_text"),
])]), ])]),
Text::from(Line("Spinner").big_heading_styled().size(18)).draw(ctx), Text::from(Line("Spinner").big_heading_styled().size(18)).into_widget(ctx),
widgetry::Spinner::widget(ctx, (0, 11), 1), widgetry::Spinner::widget(ctx, (0, 11), 1),
Widget::row(vec![ Widget::row(vec![
ctx.style() ctx.style()
@ -449,7 +449,7 @@ fn make_controls(ctx: &mut EventCtx) -> Panel {
.big_heading_styled() .big_heading_styled()
.size(18), .size(18),
) )
.draw(ctx), .into_widget(ctx),
{ {
let row_height = 10; let row_height = 10;
let mut id = 0; let mut id = 0;