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

make it a little easier to snag default text size's line height

Browse Source
This commit is contained in:
Dustin Carlino 2019-09-06 12:44:37 -07:00
parent d268438e87
commit 60a48be5bc
5 changed files with 28 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
editor/src/common/colors.rs
View File

@ -1,7 +1,7 @@
use crate::helpers::ID;
use crate::render::{DrawOptions, MIN_ZOOM_FOR_DETAIL};
use crate::ui::{ShowEverything, UI};
use ezgui::{Color, Drawable, EventCtx, GeomBatch, GfxCtx, ScreenPt, Text};
use ezgui::{Color, Drawable, EventCtx, GeomBatch, GfxCtx, ScreenPt, Text, LINE_HEIGHT};
use geom::{Distance, Polygon, Pt2D};
use map_model::{BuildingID, LaneID, Map, RoadID};
use std::collections::HashMap;
@ -154,13 +154,11 @@ impl ColorLegend {
for (label, _) in &self.rows {
txt.add_line(label.to_string());
}
// TODO better ezgui constant for default line height, assert it matches font upon init
let line_height = 30.0;
g.draw_text_at_screenspace_topleft(
&txt,
ScreenPt::new(
50.0,
g.canvas.window_height - (line_height * ((self.rows.len() + 2) as f64)),
g.canvas.window_height - (LINE_HEIGHT * ((self.rows.len() + 2) as f64)),
),
);
@ -172,7 +170,7 @@ impl ColorLegend {
Polygon::rectangle_topleft(
Pt2D::new(
20.0,
g.canvas.window_height - line_height * (offset_from_bottom as f64),
g.canvas.window_height - LINE_HEIGHT * (offset_from_bottom as f64),
),
Distance::meters(10.0),
Distance::meters(10.0),

4
ezgui/src/lib.rs
View File

@ -28,3 +28,7 @@ pub enum InputResult<T: Clone> {
StillActive,
Done(String, T),
}
// At the default text size. Exposed for convenience outside, but ideally, this shouldn't be
// needed...
pub const LINE_HEIGHT: f64 = 30.0;

3
ezgui/src/runner.rs
View File

@ -1,5 +1,5 @@
use crate::input::ContextMenu;
use crate::{text, widgets, Canvas, Event, EventCtx, GfxCtx, Prerender, UserInput};
use crate::{text, widgets, Canvas, Event, EventCtx, GfxCtx, Prerender, UserInput, LINE_HEIGHT};
use glium::glutin;
use glium_glyph::glyph_brush::rusttype::Font;
use glium_glyph::{GlyphBrush, GlyphBrushBuilder};
@ -250,6 +250,7 @@ pub fn run<G: GUI, F: FnOnce(&mut EventCtx) -> G>(
screenspace_glyphs,
mapspace_glyphs,
);
assert_eq!(LINE_HEIGHT, canvas.line_height(text::FONT_SIZE));
let prerender = Prerender {
display: &display,
num_uploads: Cell::new(0),

41
ezgui/src/widgets/menu.rs
View File

@ -1,7 +1,7 @@
use crate::screen_geom::ScreenRectangle;
use crate::{
hotkey, lctrl, text, Canvas, Color, Event, GeomBatch, GfxCtx, InputResult, Key, MultiKey,
ScreenPt, Text,
ScreenPt, Text, LINE_HEIGHT,
};
use geom::{Circle, Distance, Polygon, Pt2D};
use std::collections::HashSet;
@ -53,8 +53,6 @@ impl<T: Clone> Menu<T> {
pos: Position,
canvas: &Canvas,
) -> Menu<T> {
let row_height = row_height(canvas);
let mut used_keys = HashSet::new();
let mut used_labels = HashSet::new();
let mut choices = Vec::new();
@ -76,7 +74,8 @@ impl<T: Clone> Menu<T> {
}
used_labels.insert(label.clone());
let dy1 = ((txt.num_lines() - prompt_lines) as f64) * row_height + separator_offset;
let dy1 =
((txt.num_lines() - prompt_lines) as f64) * LINE_HEIGHT + separator_offset;
if let Some(key) = maybe_key {
txt.add_line(format!("{} - {}", key.describe(), label));
} else {
@ -91,8 +90,8 @@ impl<T: Clone> Menu<T> {
dy1,
});
}
separator_offset += row_height / 2.0;
separators.push(choices.last().unwrap().dy1 + row_height);
separator_offset += LINE_HEIGHT / 2.0;
separators.push(choices.last().unwrap().dy1 + LINE_HEIGHT);
}
// The last one would be at the very bottom of the menu
separators.pop();
@ -126,9 +125,7 @@ impl<T: Clone> Menu<T> {
if self.hideable {
if let Event::MouseMovedTo(pt) = ev {
if !canvas.is_dragging() {
self.icon_selected = self
.get_expand_icon(canvas)
.contains_pt(Pt2D::new(pt.x, pt.y));
self.icon_selected = self.get_expand_icon().contains_pt(Pt2D::new(pt.x, pt.y));
}
}
@ -164,18 +161,17 @@ impl<T: Clone> Menu<T> {
return InputResult::Canceled;
} else if let Event::MouseMovedTo(pt) = ev {
if !canvas.is_dragging() {
let row_height = row_height(canvas);
for (idx, choice) in self.choices.iter().enumerate() {
let y1 = self.top_left.y
+ choice.dy1
+ (self.prompt.num_lines() as f64) * row_height;
+ (self.prompt.num_lines() as f64) * LINE_HEIGHT;
if choice.active
&& (ScreenRectangle {
x1: self.top_left.x,
y1,
x2: self.top_left.x + self.total_width,
y2: y1 + row_height,
y2: y1 + LINE_HEIGHT,
}
.contains(pt))
{
@ -244,7 +240,7 @@ impl<T: Clone> Menu<T> {
if self.hidden {
let mut batch = GeomBatch::new();
// Draw the expand icon. Hopefully it doesn't clobber the prompt.
let icon = self.get_expand_icon(g.canvas);
let icon = self.get_expand_icon();
batch.push(
if self.icon_selected {
ICON_BACKGROUND_SELECTED
@ -276,10 +272,9 @@ impl<T: Clone> Menu<T> {
return;
}
let row_height = row_height(g.canvas);
let base_y = self.top_left.y + (self.prompt.num_lines() as f64) * row_height;
let base_y = self.top_left.y + (self.prompt.num_lines() as f64) * LINE_HEIGHT;
let choices_total_height = self.choices.last().unwrap().dy1 + row_height;
let choices_total_height = self.choices.last().unwrap().dy1 + LINE_HEIGHT;
let mut batch = GeomBatch::new();
batch.push(
@ -301,16 +296,16 @@ impl<T: Clone> Menu<T> {
batch.push(
Color::grey(0.4),
Polygon::rectangle_topleft(
Pt2D::new(self.top_left.x, base_y + *dy1 + (row_height / 4.0)),
Pt2D::new(self.top_left.x, base_y + *dy1 + (LINE_HEIGHT / 4.0)),
Distance::meters(self.total_width),
Distance::meters(row_height / 4.0),
Distance::meters(LINE_HEIGHT / 4.0),
),
);
}
// Draw the minimize icon. Hopefully it doesn't clobber the prompt.
if self.hideable {
let icon = self.get_expand_icon(g.canvas);
let icon = self.get_expand_icon();
batch.push(
if self.icon_selected {
ICON_BACKGROUND_SELECTED
@ -438,8 +433,8 @@ impl<T: Clone> Menu<T> {
self.prompt.override_width = Some(total_width);
}
fn get_expand_icon(&self, canvas: &Canvas) -> Circle {
let radius = row_height(canvas) / 2.0;
fn get_expand_icon(&self) -> Circle {
let radius = LINE_HEIGHT / 2.0;
Circle::new(
Pt2D::new(
self.top_left.x + self.total_width - radius,
@ -485,7 +480,3 @@ impl Position {
}
}
}
fn row_height(canvas: &Canvas) -> f64 {
canvas.line_height(text::FONT_SIZE)
}

6
ezgui/src/widgets/slider.rs
View File

@ -1,8 +1,8 @@
use crate::screen_geom::ScreenRectangle;
use crate::widgets::text_box::TextBox;
use crate::{
hotkey, text, Canvas, Color, EventCtx, EventLoopMode, GfxCtx, InputResult, Key, ModalMenu,
MultiKey, ScreenPt, Text, Warper,
hotkey, Canvas, Color, EventCtx, EventLoopMode, GfxCtx, InputResult, Key, ModalMenu, MultiKey,
ScreenPt, Text, Warper, LINE_HEIGHT,
};
use geom::{Distance, Duration, Polygon, Pt2D};
use std::str::FromStr;
@ -357,7 +357,7 @@ impl SliderWithTextBox {
// TODO Need to re-center when window is resized
let mut top_left = canvas.center_to_screen_pt();
top_left.x -= (BAR_WIDTH + 2.0 * HORIZ_PADDING) / 2.0;
top_left.y -= (BAR_HEIGHT + 2.0 * VERT_PADDING + canvas.line_height(text::FONT_SIZE)) / 2.0;
top_left.y -= (BAR_HEIGHT + 2.0 * VERT_PADDING + LINE_HEIGHT) / 2.0;
SliderWithTextBox {
slider: Slider::new(Some(top_left)),