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

changing DrawBoth internally to use the new thing. this actually gets

Browse Source 
most callers!
This commit is contained in:
Dustin Carlino 2020-02-06 15:38:25 -08:00
parent fa6cbea28c
commit 3eea1f2a45
2 changed files with 9 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ezgui/src/drawing.rs
View File

@ -560,29 +560,18 @@ impl<'a> Prerender<'a> {
// thing, it'd be weird to do that.
pub struct DrawBoth {
geom: Drawable,
txt: Vec<(Text, ScreenPt)>,
// Covers both geometry and text
dims: ScreenDims,
}
impl DrawBoth {
pub fn new(ctx: &EventCtx, batch: GeomBatch, txt: Vec<(Text, ScreenPt)>) -> DrawBoth {
let mut total_dims = batch.get_dims();
for (t, pt) in &txt {
let dims = ctx.text_dims(t);
let w = dims.width + pt.x;
let h = dims.height + pt.y;
if w > total_dims.width {
total_dims.width = w;
}
if h > total_dims.height {
total_dims.height = h;
}
pub fn new(ctx: &EventCtx, mut batch: GeomBatch, texts: Vec<(Text, ScreenPt)>) -> DrawBoth {
for (txt, pt) in texts {
txt.render(&mut batch, pt);
}
DrawBoth {
dims: batch.get_dims(),
geom: batch.upload(ctx),
txt,
dims: total_dims,
}
}
@ -591,16 +580,6 @@ impl DrawBoth {
g.fork(Pt2D::new(0.0, 0.0), top_left, 1.0);
g.redraw(&self.geom);
g.unfork();
for (txt, pt) in &self.txt {
let dims = g.text_dims(&txt);
text::draw_text_bubble(
g,
ScreenPt::new(top_left.x + pt.x, top_left.y + pt.y),
txt,
dims,
true,
);
}
}
pub fn get_dims(&self) -> ScreenDims {

12
ezgui/src/widgets/button.rs
View File

@ -233,13 +233,11 @@ impl Button {
GeomBatch::from(vec![(unselected_bg_color, geom.clone())]),
draw_text.clone(),
);
let mut hovered_batch = GeomBatch::from(vec![(selected_bg_color, geom.clone())]);
// TODO Testing things out
let mut test = Text::from(Line(tooltip).fg(Color::PURPLE));
test.add(Line("123").fg(Color::RED));
test.append(Line(" space").fg(Color::BLUE));
test.render(&mut hovered_batch, ScreenPt::new(5.0, 5.0));
let hovered = DrawBoth::new(ctx, hovered_batch, draw_text);
let hovered = DrawBoth::new(
ctx,
GeomBatch::from(vec![(selected_bg_color, geom.clone())]),
draw_text.clone(),
);
Button::new(normal, hovered, hotkey, tooltip, geom)
}