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

remove final references to Btn

Browse Source
This commit is contained in:
Michael Kirk 2021-01-21 10:17:52 -06:00 committed by Dustin Carlino
parent 542600da2f
commit 4989887117
11 changed files with 57 additions and 155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fifteen_min/src/viewer.rs
View File

@ -12,7 +12,7 @@ use map_model::connectivity::WalkingOptions;
use map_model::{AmenityType, Building, BuildingID, LaneType};
use widgetry::table::{Col, Filter, Table};
use widgetry::{
lctrl, Btn, Cached, Checkbox, Choice, Color, Drawable, EventCtx, GeomBatch, GfxCtx,
lctrl, Cached, Checkbox, Choice, Color, Drawable, EventCtx, GeomBatch, GfxCtx,
HorizontalAlignment, Key, Line, Outcome, Panel, RewriteColor, State, StyledButtons, Text,
TextExt, Transition, VerticalAlignment, Widget,
};
@ -314,11 +314,9 @@ fn build_panel(ctx: &mut EventCtx, app: &App, start: &Building, isochrone: &Isoc
for (amenity, buildings) in isochrone.amenities_reachable.borrow() {
rows.push(
Btn::text_fg(format!("{}: {}", amenity, buildings.len())).build(
ctx,
format!("businesses: {}", amenity),
None,
),
ctx.style()
.btn_secondary_light_text(&format!("{}: {}", amenity, buildings.len()))
.build_widget(ctx, &format!("businesses: {}", amenity)),
);
}

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

@ -10,8 +10,8 @@ use map_gui::tools::{grey_out_map, ChooseSomething, ColorLegend, PopupMsg};
use map_gui::ID;
use map_model::{EditCmd, IntersectionID, LaneID, LaneType, MapEdits};
use widgetry::{
lctrl, Btn, Choice, Color, ControlState, Drawable, EventCtx, GfxCtx, HorizontalAlignment, Key,
Line, Menu, Outcome, Panel, State, StyledButtons, Text, TextExt, VerticalAlignment, Widget,
lctrl, Choice, Color, ControlState, Drawable, EventCtx, GfxCtx, HorizontalAlignment, Key, Line,
Menu, Outcome, Panel, State, StyledButtons, Text, TextExt, VerticalAlignment, Widget,
};
pub use self::cluster_traffic_signals::ClusterTrafficSignalEditor;
@ -547,7 +547,11 @@ impl LoadEdits {
for name in abstio::list_all_objects(abstio::path("system/proposals")) {
let path = abstio::path(format!("system/proposals/{}.json", name));
if MapEdits::load(&app.primary.map, path.clone(), &mut Timer::throwaway()).is_ok() {
proposals.push(Btn::text_fg(&name).build(ctx, path, None));
proposals.push(
ctx.style()
.btn_secondary_light_text(&name)
.build_widget(ctx, &path),
);
}
}

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

@ -10,7 +10,7 @@ use map_model::{
TurnPriority,
};
use widgetry::{
lctrl, Btn, Color, ControlState, DrawBaselayer, Drawable, EventCtx, GeomBatch, GfxCtx,
lctrl, Color, ControlState, DrawBaselayer, Drawable, EventCtx, GeomBatch, GfxCtx,
HorizontalAlignment, Key, Line, MultiButton, Outcome, Panel, RewriteColor, State,
StyledButtons, Text, TextExt, VerticalAlignment, Widget,
};
@ -546,7 +546,8 @@ fn make_top_panel(ctx: &mut EventCtx, app: &App, can_undo: bool, can_redo: bool)
]),
Widget::row(row),
if app.opts.dev {
Btn::text_fg("Export")
ctx.style()
.btn_secondary_light_text("Export")
.tooltip(Text::from_multiline(vec![
Line("This will create a JSON file in traffic_signal_data/.").small(),
Line(
@ -555,7 +556,7 @@ fn make_top_panel(ctx: &mut EventCtx, app: &App, can_undo: bool, can_redo: bool)
)
.small(),
]))
.build_def(ctx, None)
.build_def(ctx)
} else {
Widget::nothing()
},

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

@ -4,7 +4,7 @@ use map_gui::tools::ColorNetwork;
use map_gui::ID;
use map_model::{BusRoute, BusRouteID, BusStopID, PathStep};
use sim::{AgentID, CarID};
use widgetry::{Btn, Color, EventCtx, Key, Line, StyledButtons, Text, TextExt, Widget};
use widgetry::{Color, EventCtx, Key, Line, StyledButtons, Text, TextExt, Widget};
use crate::app::App;
use crate::info::{header_btns, make_tabs, Details, Tab};
@ -25,7 +25,11 @@ pub fn stop(ctx: &mut EventCtx, app: &App, details: &mut Details, id: BusStopID)
for r in app.primary.map.get_routes_serving_stop(id) {
// Full names can overlap, so include the ID
let label = format!("{} ({})", r.full_name, r.id);
rows.push(Btn::text_fg(format!("Route {}", r.short_name)).build(ctx, &label, None));
rows.push(
ctx.style()
.btn_secondary_light_text(&format!("Route {}", r.short_name))
.build_widget(ctx, &label),
);
details.hyperlinks.insert(label, Tab::BusRoute(r.id));
let arrivals: Vec<(Time, CarID)> = all_arrivals
@ -290,7 +294,12 @@ pub fn route(ctx: &mut EventCtx, app: &App, details: &mut Details, id: BusRouteI
// TODO Soon it'll be time to split into tabs
{
rows.push(Btn::text_fg("Edit schedule").build(ctx, format!("edit {}", route.id), Key::E));
rows.push(
ctx.style()
.btn_secondary_light_text("Edit schedule")
.hotkey(Key::E)
.build_widget(ctx, &format!("edit {}", route.id)),
);
rows.push(describe_schedule(route).draw(ctx));
}

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

@ -7,7 +7,7 @@ use map_gui::render::traffic_signal::draw_signal_stage;
use map_model::{IntersectionID, IntersectionType, StageType};
use sim::AgentType;
use widgetry::{
Btn, Checkbox, Color, DrawWithTooltips, EventCtx, FanChart, GeomBatch, Line, PlotOptions,
Checkbox, Color, DrawWithTooltips, EventCtx, FanChart, GeomBatch, Line, PlotOptions,
ScatterPlot, Series, StyledButtons, Text, Widget,
};
@ -220,11 +220,11 @@ pub fn current_demand(
.build_def(ctx),
);
if app.opts.dev {
rows.push(Btn::text_fg("Where are these agents headed?").build(
ctx,
format!("routes across {}", id),
None,
));
rows.push(
ctx.style()
.btn_secondary_light_text("Where are these agents headed?")
.build_widget(ctx, &format!("routes across {}", id)),
);
}
rows

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

@ -2,8 +2,8 @@ use abstutil::{prettyprint_usize, Counter};
use geom::Time;
use map_model::BusRouteID;
use widgetry::{
Autocomplete, Btn, DrawBaselayer, EventCtx, GfxCtx, Line, LinePlot, Outcome, Panel,
PlotOptions, Series, State, TextExt, Widget,
Autocomplete, DrawBaselayer, EventCtx, GfxCtx, Line, LinePlot, Outcome, Panel, PlotOptions,
Series, State, StyledButtons, TextExt, Widget,
};
use crate::app::{App, Transition};
@ -172,7 +172,9 @@ impl TransitRoutes {
.into_iter()
.map(|(boardings, alightings, waiting, name, id)| {
Widget::row(vec![
Btn::text_fg(name).build(ctx, id.to_string(), None),
ctx.style()
.btn_secondary_light_text(&name)
.build_widget(ctx, &id.to_string()),
format!(
"{} boardings, {} alightings, {} currently waiting",
prettyprint_usize(-boardings as usize),

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

@ -2,7 +2,7 @@ use abstio::MapName;
use geom::{Distance, Percent, Polygon, Pt2D};
use map_model::City;
use widgetry::{
Autocomplete, Btn, Color, ControlState, DrawBaselayer, EventCtx, GeomBatch, GfxCtx, Key, Line,
Autocomplete, Color, ControlState, DrawBaselayer, EventCtx, GeomBatch, GfxCtx, Key, Line,
Outcome, Panel, ScreenPt, State, StyledButtons, Text, TextExt, Transition, Widget,
};
@ -271,8 +271,9 @@ impl<A: AppLike + 'static> AllCityPicker<A> {
for name in MapName::list_all_maps() {
buttons.push(
Btn::text_fg(name.describe())
.build(ctx, name.path(), None)
ctx.style()
.btn_secondary_light_text(&name.describe())
.build_widget(ctx, &name.path())
.margin_right(10)
.margin_below(10),
);

6
santa/src/before_level.rs
View File

@ -11,9 +11,9 @@ use map_gui::tools::PopupMsg;
use map_gui::ID;
use map_model::BuildingID;
use widgetry::{
Btn, ButtonBuilder, Color, ControlState, Drawable, EventCtx, GeomBatch, GfxCtx,
HorizontalAlignment, Key, Line, Outcome, Panel, RewriteColor, State, StyledButtons, Text,
TextExt, VerticalAlignment, Widget,
ButtonBuilder, Color, ControlState, Drawable, EventCtx, GeomBatch, GfxCtx, HorizontalAlignment,
Key, Line, Outcome, Panel, RewriteColor, State, StyledButtons, Text, TextExt,
VerticalAlignment, Widget,
};
use crate::buildings::{BldgState, Buildings};

2
widgetry/src/lib.rs
View File

@ -47,7 +47,7 @@ pub use crate::tools::warper::Warper;
pub use crate::tools::Cached;
pub use crate::widgets::autocomplete::Autocomplete;
pub(crate) use crate::widgets::button::Button;
pub use crate::widgets::button::{Btn, ButtonBuilder, MultiButton};
pub use crate::widgets::button::{ButtonBuilder, MultiButton};
pub use crate::widgets::checkbox::Checkbox;
pub use crate::widgets::compare_times::CompareTimes;
pub(crate) use crate::widgets::dropdown::Dropdown;

120
widgetry/src/widgets/button.rs
View File

@ -29,31 +29,6 @@ pub struct Button {
}
impl Button {
fn widget(
ctx: &EventCtx,
normal: GeomBatch,
hovered: GeomBatch,
disabled: GeomBatch,
hotkey: Option<MultiKey>,
action: &str,
maybe_tooltip: Option<Text>,
hitbox: Polygon,
is_disabled: bool,
) -> Widget {
Widget::new(Box::new(Self::new(
ctx,
normal,
hovered,
disabled,
hotkey,
action,
maybe_tooltip,
hitbox,
is_disabled,
)))
.named(action)
}
fn new(
ctx: &EventCtx,
normal: GeomBatch,
@ -147,16 +122,6 @@ impl WidgetImpl for Button {
}
}
/// A questionably named place to start creating buttons.
pub struct Btn {}
impl Btn {
pub fn text_fg<I: Into<String>>(action: I) -> BtnBuilder {
let action = action.into();
BtnBuilder::TextFG(action.clone(), Text::from(Line(action)), None)
}
}
#[derive(Clone, Debug, Default)]
pub struct ButtonBuilder<'a> {
padding: EdgeInsets,
@ -675,91 +640,6 @@ struct Label<'a> {
font: Option<Font>,
}
pub enum BtnBuilder {
TextFG(String, Text, Option<Text>),
}
impl BtnBuilder {
pub fn tooltip(mut self, tooltip: Text) -> BtnBuilder {
match self {
BtnBuilder::TextFG(_, _, ref mut maybe_tooltip) => {
assert!(maybe_tooltip.is_none());
*maybe_tooltip = Some(tooltip);
}
}
self
}
pub fn no_tooltip(self) -> BtnBuilder {
self.tooltip(Text::new())
}
pub fn build<I: Into<String>, MK: Into<Option<MultiKey>>>(
self,
ctx: &EventCtx,
action: I,
key: MK,
) -> Widget {
match self {
BtnBuilder::TextFG(_, normal_txt, maybe_t) => {
let (normal, hitbox) = normal_txt
.clone()
.batch(ctx)
.container()
.padding(8)
.to_geom(ctx, None);
let (hovered, _) = normal_txt
.change_fg(Color::ORANGE)
.batch(ctx)
.container()
.padding(8)
.to_geom(ctx, None);
Button::widget(
ctx,
normal.clone(),
hovered,
normal,
key.into(),
&action.into(),
maybe_t,
hitbox,
false,
)
.outline(2.0, Color::WHITE)
}
}
}
// Use the text as the action
pub fn build_def<MK: Into<Option<MultiKey>>>(self, ctx: &EventCtx, key: MK) -> Widget {
match self {
BtnBuilder::TextFG(ref action, _, _) => {
assert!(!action.is_empty());
let copy = action.clone();
self.build(ctx, copy, key)
}
}
}
pub fn inactive(self, ctx: &EventCtx) -> Widget {
match self {
BtnBuilder::TextFG(action, txt, _) => Widget::draw_batch(
ctx,
txt.change_fg(Color::grey(0.5))
.render(ctx)
.batch()
.container()
.padding(8)
.outline(2.0, Color::WHITE)
.to_geom(ctx, None)
.0,
)
.named(action),
}
}
}
// Like an image map from the old HTML days
pub struct MultiButton {
draw: Drawable,

15
widgetry_demo/src/lib.rs
View File

@ -5,7 +5,7 @@ use rand_xorshift::XorShiftRng;
use geom::{Angle, Duration, Percent, Polygon, Pt2D, Time};
use widgetry::{
lctrl, Btn, Checkbox, Choice, Color, Drawable, EventCtx, Fill, GeomBatch, GfxCtx,
lctrl, Checkbox, Choice, Color, Drawable, EventCtx, Fill, GeomBatch, GfxCtx,
HorizontalAlignment, Key, Line, LinePlot, Outcome, Panel, PersistentSplit, PlotOptions, Series,
SharedAppState, State, StyledButtons, Text, TextExt, Texture, Transition, UpdateType,
VerticalAlignment, Widget,
@ -380,7 +380,10 @@ fn make_controls(ctx: &mut EventCtx) -> Panel {
Text::from(Line("Spinner").big_heading_styled().size(18)).draw(ctx),
widgetry::Spinner::new(ctx, (0, 11), 1),
Widget::row(vec![
Btn::text_fg("New faces").build(ctx, "generate new faces", Key::F),
ctx.style()
.btn_secondary_light_text("New faces")
.hotkey(Key::F)
.build_widget(ctx, "generate new faces"),
Checkbox::switch(ctx, "Draw scrollable canvas", None, true),
Checkbox::switch(ctx, "Show timeseries", lctrl(Key::T), false),
]),
@ -411,7 +414,9 @@ fn make_controls(ctx: &mut EventCtx) -> Panel {
Choice::new("-10s", Duration::seconds(-10.0)),
],
),
Btn::text_fg("Reset Timer").build(ctx, "reset the stopwatch", None),
ctx.style()
.btn_secondary_light_text("Reset Timer")
.build_widget(ctx, "reset the stopwatch"),
])
.evenly_spaced(),
Widget::row(vec![
@ -448,7 +453,9 @@ fn make_controls(ctx: &mut EventCtx) -> Panel {
Choice::new("Hot", (Texture::SAND, Texture::CACTUS)),
],
),
Btn::text_fg("Apply").build(ctx, "apply", None),
ctx.style()
.btn_secondary_light_text("Apply")
.build_widget(ctx, "apply"),
])
.margin_above(30),
]))