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

Adjust the steep streets panel: #82

Browse Source 
- Move the steepest grade under the legend
- Use an arrow icon in the text
This commit is contained in:
Dustin Carlino 2021-03-26 11:40:01 -07:00
parent 05c9134e92
commit 7a565f114f
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
use geom::{ArrowCap, Distance, PolyLine};
use geom::{ArrowCap, Distance, PolyLine, Pt2D};
use map_gui::tools::ColorDiscrete;
use map_gui::ID;
use widgetry::{Color, Drawable, EventCtx, GeomBatch, GfxCtx, Panel, Text, TextExt, Widget};
@ -61,6 +61,8 @@ impl SteepStreets {
],
);
let arrow_len = Distance::meters(5.0);
let thickness = Distance::meters(1.0);
let mut steepest = 0.0_f64;
let mut arrows = GeomBatch::new();
for r in app.primary.map.all_roads() {
@ -93,9 +95,7 @@ impl SteepStreets {
pl = pl.reversed();
}
let arrow_len = Distance::meters(5.0);
let btwn = Distance::meters(10.0);
let thickness = Distance::meters(1.0);
let len = pl.length();
let mut dist = arrow_len;
@ -117,9 +117,22 @@ impl SteepStreets {
let panel = Panel::new(Widget::col(vec![
header(ctx, "Steep streets"),
format!("Steepest road: {:.0}% incline", steepest * 100.0).text_widget(ctx),
"Arrows point uphill".text_widget(ctx),
Widget::row(vec![
GeomBatch::from(vec![(
ctx.style().text_fg_color,
PolyLine::must_new(vec![
Pt2D::new(0.0, 0.0),
Pt2D::new(arrow_len.inner_meters(), 0.0),
])
.make_arrow(thickness, ArrowCap::Triangle)
.scale(10.0),
)])
.autocrop()
.into_widget(ctx),
"points uphill".text_widget(ctx).centered_vert(),
]),
legend,
format!("Steepest road: {:.0}% incline", steepest * 100.0).text_widget(ctx),
]))
.aligned_pair(PANEL_PLACEMENT)
.build(ctx);