2019-12-21 02:56:04 +03:00
|
|
|
use crate::layout::Widget;
|
2020-01-02 20:35:41 +03:00
|
|
|
use crate::widgets::PopupMenu;
|
2019-12-21 02:56:04 +03:00
|
|
|
use crate::{
|
2019-12-29 19:16:38 +03:00
|
|
|
Button, Color, DrawBoth, EventCtx, Filler, GeomBatch, GfxCtx, Histogram, HorizontalAlignment,
|
|
|
|
JustDraw, Plot, ScreenDims, ScreenPt, ScreenRectangle, Slider, Text, VerticalAlignment,
|
2019-12-21 02:56:04 +03:00
|
|
|
};
|
2020-01-02 20:35:41 +03:00
|
|
|
use abstutil::Cloneable;
|
2019-12-21 02:56:04 +03:00
|
|
|
use geom::{Distance, Duration, Polygon};
|
|
|
|
use std::collections::{HashMap, HashSet};
|
|
|
|
use stretch::geometry::{Rect, Size};
|
|
|
|
use stretch::node::{Node, Stretch};
|
|
|
|
use stretch::style::{AlignItems, Dimension, FlexDirection, FlexWrap, JustifyContent, Style};
|
|
|
|
|
2020-01-02 20:35:41 +03:00
|
|
|
type Menu = PopupMenu<Box<dyn Cloneable>>;
|
|
|
|
|
2019-12-21 02:56:04 +03:00
|
|
|
pub struct ManagedWidget {
|
|
|
|
widget: WidgetType,
|
|
|
|
style: LayoutStyle,
|
|
|
|
rect: ScreenRectangle,
|
2019-12-22 21:52:41 +03:00
|
|
|
bg: Option<DrawBoth>,
|
2019-12-21 02:56:04 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
enum WidgetType {
|
|
|
|
Draw(JustDraw),
|
|
|
|
Btn(Button),
|
|
|
|
Slider(String),
|
2020-01-02 20:35:41 +03:00
|
|
|
Menu(String),
|
2019-12-25 23:01:51 +03:00
|
|
|
Filler(String),
|
2019-12-21 02:56:04 +03:00
|
|
|
// TODO Sadness. Can't have some kind of wildcard generic here?
|
|
|
|
DurationPlot(Plot<Duration>),
|
|
|
|
UsizePlot(Plot<usize>),
|
2019-12-29 19:16:38 +03:00
|
|
|
Histogram(Histogram),
|
2019-12-21 02:56:04 +03:00
|
|
|
Row(Vec<ManagedWidget>),
|
|
|
|
Column(Vec<ManagedWidget>),
|
|
|
|
}
|
|
|
|
|
|
|
|
struct LayoutStyle {
|
|
|
|
bg_color: Option<Color>,
|
|
|
|
align_items: Option<AlignItems>,
|
|
|
|
justify_content: Option<JustifyContent>,
|
|
|
|
flex_wrap: Option<FlexWrap>,
|
2019-12-23 22:05:24 +03:00
|
|
|
size: Option<Size<Dimension>>,
|
2019-12-21 02:56:04 +03:00
|
|
|
padding: Option<Rect<Dimension>>,
|
|
|
|
margin: Option<Rect<Dimension>>,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl LayoutStyle {
|
|
|
|
fn apply(&self, style: &mut Style) {
|
|
|
|
if let Some(x) = self.align_items {
|
|
|
|
style.align_items = x;
|
|
|
|
}
|
|
|
|
if let Some(x) = self.justify_content {
|
|
|
|
style.justify_content = x;
|
|
|
|
}
|
|
|
|
if let Some(x) = self.flex_wrap {
|
|
|
|
style.flex_wrap = x;
|
|
|
|
}
|
2019-12-23 22:05:24 +03:00
|
|
|
if let Some(x) = self.size {
|
|
|
|
style.size = x;
|
|
|
|
}
|
2019-12-21 02:56:04 +03:00
|
|
|
if let Some(x) = self.padding {
|
|
|
|
style.padding = x;
|
|
|
|
}
|
|
|
|
if let Some(x) = self.margin {
|
|
|
|
style.margin = x;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Layouting
|
|
|
|
// TODO Maybe I just want margin, not padding. And maybe more granular controls per side. And to
|
|
|
|
// apply margin to everything in a row or column.
|
|
|
|
// TODO Row and columns feel backwards when using them.
|
|
|
|
impl ManagedWidget {
|
|
|
|
pub fn centered(mut self) -> ManagedWidget {
|
|
|
|
self.style.align_items = Some(AlignItems::Center);
|
|
|
|
self.style.justify_content = Some(JustifyContent::SpaceAround);
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn centered_cross(mut self) -> ManagedWidget {
|
|
|
|
self.style.align_items = Some(AlignItems::Center);
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn evenly_spaced(mut self) -> ManagedWidget {
|
|
|
|
self.style.justify_content = Some(JustifyContent::SpaceBetween);
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2019-12-23 22:05:24 +03:00
|
|
|
pub fn flex_wrap(mut self, ctx: &EventCtx) -> ManagedWidget {
|
2019-12-21 02:56:04 +03:00
|
|
|
self.style.flex_wrap = Some(FlexWrap::Wrap);
|
|
|
|
self.style.justify_content = Some(JustifyContent::SpaceAround);
|
2019-12-23 22:05:24 +03:00
|
|
|
self.style.size = Some(Size {
|
|
|
|
width: Dimension::Points(ctx.canvas.window_width as f32),
|
|
|
|
height: Dimension::Undefined,
|
|
|
|
});
|
2019-12-21 02:56:04 +03:00
|
|
|
self
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn bg(mut self, color: Color) -> ManagedWidget {
|
|
|
|
self.style.bg_color = Some(color);
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn padding(mut self, pixels: usize) -> ManagedWidget {
|
|
|
|
self.style.padding = Some(Rect {
|
|
|
|
start: Dimension::Points(pixels as f32),
|
|
|
|
end: Dimension::Points(pixels as f32),
|
|
|
|
top: Dimension::Points(pixels as f32),
|
|
|
|
bottom: Dimension::Points(pixels as f32),
|
|
|
|
});
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn margin(mut self, pixels: usize) -> ManagedWidget {
|
|
|
|
self.style.margin = Some(Rect {
|
|
|
|
start: Dimension::Points(pixels as f32),
|
|
|
|
end: Dimension::Points(pixels as f32),
|
|
|
|
top: Dimension::Points(pixels as f32),
|
|
|
|
bottom: Dimension::Points(pixels as f32),
|
|
|
|
});
|
|
|
|
self
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Convenient?? constructors
|
|
|
|
impl ManagedWidget {
|
|
|
|
fn new(widget: WidgetType) -> ManagedWidget {
|
|
|
|
ManagedWidget {
|
|
|
|
widget,
|
|
|
|
style: LayoutStyle {
|
|
|
|
bg_color: None,
|
|
|
|
align_items: None,
|
|
|
|
justify_content: None,
|
|
|
|
flex_wrap: None,
|
2019-12-23 22:05:24 +03:00
|
|
|
size: None,
|
2019-12-21 02:56:04 +03:00
|
|
|
padding: None,
|
|
|
|
margin: None,
|
|
|
|
},
|
|
|
|
rect: ScreenRectangle::placeholder(),
|
|
|
|
bg: None,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn draw_batch(ctx: &EventCtx, batch: GeomBatch) -> ManagedWidget {
|
|
|
|
ManagedWidget::new(WidgetType::Draw(JustDraw::wrap(DrawBoth::new(
|
|
|
|
ctx,
|
|
|
|
batch,
|
|
|
|
Vec::new(),
|
|
|
|
))))
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn just_draw(j: JustDraw) -> ManagedWidget {
|
|
|
|
ManagedWidget::new(WidgetType::Draw(j))
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn draw_text(ctx: &EventCtx, txt: Text) -> ManagedWidget {
|
|
|
|
ManagedWidget::new(WidgetType::Draw(JustDraw::text(txt, ctx)))
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn draw_svg(ctx: &EventCtx, filename: &str) -> ManagedWidget {
|
|
|
|
ManagedWidget::new(WidgetType::Draw(JustDraw::svg(filename, ctx)))
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn btn(btn: Button) -> ManagedWidget {
|
|
|
|
ManagedWidget::new(WidgetType::Btn(btn))
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn slider(label: &str) -> ManagedWidget {
|
|
|
|
ManagedWidget::new(WidgetType::Slider(label.to_string()))
|
|
|
|
}
|
|
|
|
|
2020-01-02 20:35:41 +03:00
|
|
|
pub fn menu(label: &str) -> ManagedWidget {
|
|
|
|
ManagedWidget::new(WidgetType::Menu(label.to_string()))
|
|
|
|
}
|
|
|
|
|
2019-12-25 23:01:51 +03:00
|
|
|
pub fn filler(label: &str) -> ManagedWidget {
|
|
|
|
ManagedWidget::new(WidgetType::Filler(label.to_string()))
|
|
|
|
}
|
|
|
|
|
2019-12-21 21:43:26 +03:00
|
|
|
pub(crate) fn duration_plot(plot: Plot<Duration>) -> ManagedWidget {
|
2019-12-21 02:56:04 +03:00
|
|
|
ManagedWidget::new(WidgetType::DurationPlot(plot))
|
|
|
|
}
|
|
|
|
|
2019-12-21 21:43:26 +03:00
|
|
|
pub(crate) fn usize_plot(plot: Plot<usize>) -> ManagedWidget {
|
2019-12-21 02:56:04 +03:00
|
|
|
ManagedWidget::new(WidgetType::UsizePlot(plot))
|
|
|
|
}
|
|
|
|
|
2019-12-29 19:16:38 +03:00
|
|
|
pub(crate) fn histogram(histogram: Histogram) -> ManagedWidget {
|
|
|
|
ManagedWidget::new(WidgetType::Histogram(histogram))
|
|
|
|
}
|
|
|
|
|
2019-12-21 02:56:04 +03:00
|
|
|
pub fn row(widgets: Vec<ManagedWidget>) -> ManagedWidget {
|
|
|
|
ManagedWidget::new(WidgetType::Row(widgets))
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn col(widgets: Vec<ManagedWidget>) -> ManagedWidget {
|
|
|
|
ManagedWidget::new(WidgetType::Column(widgets))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Internals
|
|
|
|
impl ManagedWidget {
|
|
|
|
fn event(
|
|
|
|
&mut self,
|
|
|
|
ctx: &mut EventCtx,
|
2019-12-24 01:33:43 +03:00
|
|
|
sliders: &mut HashMap<String, Slider>,
|
2020-01-02 20:35:41 +03:00
|
|
|
menus: &mut HashMap<String, Menu>,
|
2019-12-21 02:56:04 +03:00
|
|
|
) -> Option<Outcome> {
|
|
|
|
match self.widget {
|
|
|
|
WidgetType::Draw(_) => {}
|
|
|
|
WidgetType::Btn(ref mut btn) => {
|
|
|
|
btn.event(ctx);
|
|
|
|
if btn.clicked() {
|
|
|
|
return Some(Outcome::Clicked(btn.action.clone()));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
WidgetType::Slider(ref name) => {
|
|
|
|
sliders.get_mut(name).unwrap().event(ctx);
|
|
|
|
}
|
2020-01-02 20:35:41 +03:00
|
|
|
WidgetType::Menu(ref name) => {
|
|
|
|
menus.get_mut(name).unwrap().event(ctx);
|
|
|
|
}
|
2019-12-29 19:16:38 +03:00
|
|
|
WidgetType::Filler(_)
|
|
|
|
| WidgetType::DurationPlot(_)
|
|
|
|
| WidgetType::UsizePlot(_)
|
|
|
|
| WidgetType::Histogram(_) => {}
|
2019-12-21 02:56:04 +03:00
|
|
|
WidgetType::Row(ref mut widgets) | WidgetType::Column(ref mut widgets) => {
|
|
|
|
for w in widgets {
|
2020-01-02 20:35:41 +03:00
|
|
|
if let Some(o) = w.event(ctx, sliders, menus) {
|
2019-12-21 02:56:04 +03:00
|
|
|
return Some(o);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
None
|
|
|
|
}
|
|
|
|
|
2020-01-02 20:35:41 +03:00
|
|
|
fn draw(
|
|
|
|
&self,
|
|
|
|
g: &mut GfxCtx,
|
|
|
|
sliders: &HashMap<String, Slider>,
|
|
|
|
menus: &HashMap<String, Menu>,
|
|
|
|
) {
|
2019-12-21 02:56:04 +03:00
|
|
|
if let Some(ref bg) = self.bg {
|
2019-12-22 21:52:41 +03:00
|
|
|
bg.redraw(ScreenPt::new(self.rect.x1, self.rect.y1), g);
|
2019-12-21 02:56:04 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
match self.widget {
|
|
|
|
WidgetType::Draw(ref j) => j.draw(g),
|
|
|
|
WidgetType::Btn(ref btn) => btn.draw(g),
|
|
|
|
WidgetType::Slider(ref name) => sliders[name].draw(g),
|
2020-01-02 20:35:41 +03:00
|
|
|
WidgetType::Menu(ref name) => menus[name].draw(g),
|
2019-12-25 23:01:51 +03:00
|
|
|
WidgetType::Filler(_) => {}
|
2019-12-21 02:56:04 +03:00
|
|
|
WidgetType::DurationPlot(ref plot) => plot.draw(g),
|
|
|
|
WidgetType::UsizePlot(ref plot) => plot.draw(g),
|
2019-12-29 19:16:38 +03:00
|
|
|
WidgetType::Histogram(ref hgram) => hgram.draw(g),
|
2019-12-21 02:56:04 +03:00
|
|
|
WidgetType::Row(ref widgets) | WidgetType::Column(ref widgets) => {
|
|
|
|
for w in widgets {
|
2020-01-02 20:35:41 +03:00
|
|
|
w.draw(g, sliders, menus);
|
2019-12-21 02:56:04 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Populate a flattened list of Nodes, matching the traversal order
|
|
|
|
fn get_flexbox(
|
|
|
|
&self,
|
|
|
|
parent: Node,
|
2019-12-24 01:33:43 +03:00
|
|
|
sliders: &HashMap<String, Slider>,
|
2020-01-02 20:35:41 +03:00
|
|
|
menus: &HashMap<String, Menu>,
|
2019-12-25 23:01:51 +03:00
|
|
|
fillers: &HashMap<String, Filler>,
|
2019-12-21 02:56:04 +03:00
|
|
|
stretch: &mut Stretch,
|
|
|
|
nodes: &mut Vec<Node>,
|
|
|
|
) {
|
|
|
|
// TODO Can I use | in the match and "cast" to Widget?
|
|
|
|
let widget: &dyn Widget = match self.widget {
|
|
|
|
WidgetType::Draw(ref widget) => widget,
|
|
|
|
WidgetType::Btn(ref widget) => widget,
|
2019-12-24 01:33:43 +03:00
|
|
|
WidgetType::Slider(ref name) => &sliders[name],
|
2020-01-02 20:35:41 +03:00
|
|
|
WidgetType::Menu(ref name) => &menus[name],
|
2019-12-25 23:01:51 +03:00
|
|
|
WidgetType::Filler(ref name) => &fillers[name],
|
2019-12-21 02:56:04 +03:00
|
|
|
WidgetType::DurationPlot(ref widget) => widget,
|
|
|
|
WidgetType::UsizePlot(ref widget) => widget,
|
2019-12-29 19:16:38 +03:00
|
|
|
WidgetType::Histogram(ref widget) => widget,
|
2019-12-21 02:56:04 +03:00
|
|
|
WidgetType::Row(ref widgets) => {
|
|
|
|
let mut style = Style {
|
|
|
|
flex_direction: FlexDirection::Row,
|
|
|
|
..Default::default()
|
|
|
|
};
|
|
|
|
self.style.apply(&mut style);
|
|
|
|
let row = stretch.new_node(style, Vec::new()).unwrap();
|
|
|
|
nodes.push(row);
|
|
|
|
for widget in widgets {
|
2020-01-02 20:35:41 +03:00
|
|
|
widget.get_flexbox(row, sliders, menus, fillers, stretch, nodes);
|
2019-12-21 02:56:04 +03:00
|
|
|
}
|
|
|
|
stretch.add_child(parent, row).unwrap();
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
WidgetType::Column(ref widgets) => {
|
|
|
|
let mut style = Style {
|
|
|
|
flex_direction: FlexDirection::Column,
|
|
|
|
..Default::default()
|
|
|
|
};
|
|
|
|
self.style.apply(&mut style);
|
|
|
|
let col = stretch.new_node(style, Vec::new()).unwrap();
|
|
|
|
nodes.push(col);
|
|
|
|
for widget in widgets {
|
2020-01-02 20:35:41 +03:00
|
|
|
widget.get_flexbox(col, sliders, menus, fillers, stretch, nodes);
|
2019-12-21 02:56:04 +03:00
|
|
|
}
|
|
|
|
stretch.add_child(parent, col).unwrap();
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
};
|
|
|
|
let dims = widget.get_dims();
|
|
|
|
let mut style = Style {
|
|
|
|
size: Size {
|
|
|
|
width: Dimension::Points(dims.width as f32),
|
|
|
|
height: Dimension::Points(dims.height as f32),
|
|
|
|
},
|
|
|
|
..Default::default()
|
|
|
|
};
|
|
|
|
self.style.apply(&mut style);
|
|
|
|
let node = stretch.new_node(style, Vec::new()).unwrap();
|
|
|
|
stretch.add_child(parent, node).unwrap();
|
|
|
|
nodes.push(node);
|
|
|
|
}
|
|
|
|
|
|
|
|
fn apply_flexbox(
|
|
|
|
&mut self,
|
2019-12-24 01:33:43 +03:00
|
|
|
sliders: &mut HashMap<String, Slider>,
|
2020-01-02 20:35:41 +03:00
|
|
|
menus: &mut HashMap<String, Menu>,
|
2019-12-25 23:01:51 +03:00
|
|
|
fillers: &mut HashMap<String, Filler>,
|
2019-12-21 02:56:04 +03:00
|
|
|
stretch: &Stretch,
|
|
|
|
nodes: &mut Vec<Node>,
|
|
|
|
dx: f64,
|
|
|
|
dy: f64,
|
2019-12-24 02:00:22 +03:00
|
|
|
scroll_y_offset: f64,
|
2019-12-21 02:56:04 +03:00
|
|
|
ctx: &EventCtx,
|
|
|
|
) {
|
|
|
|
let result = stretch.layout(nodes.pop().unwrap()).unwrap();
|
|
|
|
let x: f64 = result.location.x.into();
|
|
|
|
let y: f64 = result.location.y.into();
|
|
|
|
let width: f64 = result.size.width.into();
|
|
|
|
let height: f64 = result.size.height.into();
|
2019-12-24 02:00:22 +03:00
|
|
|
let top_left = match self.widget {
|
|
|
|
WidgetType::Slider(ref name) => {
|
|
|
|
if name == "scrollbar" {
|
|
|
|
ScreenPt::new(x + dx, y + dy)
|
|
|
|
} else {
|
|
|
|
ScreenPt::new(x + dx, y + dy - scroll_y_offset)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
_ => ScreenPt::new(x + dx, y + dy - scroll_y_offset),
|
|
|
|
};
|
|
|
|
self.rect = ScreenRectangle::top_left(top_left, ScreenDims::new(width, height));
|
2019-12-21 02:56:04 +03:00
|
|
|
if let Some(color) = self.style.bg_color {
|
2019-12-22 21:52:41 +03:00
|
|
|
// Assume widgets don't dynamically change, so we just upload the background once.
|
|
|
|
if self.bg.is_none() {
|
|
|
|
let batch = GeomBatch::from(vec![(
|
|
|
|
color,
|
|
|
|
Polygon::rounded_rectangle(
|
|
|
|
Distance::meters(width),
|
|
|
|
Distance::meters(height),
|
|
|
|
Distance::meters(5.0),
|
|
|
|
),
|
|
|
|
)]);
|
|
|
|
self.bg = Some(DrawBoth::new(ctx, batch, Vec::new()));
|
|
|
|
}
|
2019-12-21 02:56:04 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
match self.widget {
|
|
|
|
WidgetType::Draw(ref mut widget) => {
|
2019-12-24 02:00:22 +03:00
|
|
|
widget.set_pos(top_left);
|
2019-12-21 02:56:04 +03:00
|
|
|
}
|
|
|
|
WidgetType::Btn(ref mut widget) => {
|
2019-12-24 02:00:22 +03:00
|
|
|
widget.set_pos(top_left);
|
2019-12-21 02:56:04 +03:00
|
|
|
}
|
|
|
|
WidgetType::Slider(ref name) => {
|
2019-12-24 02:00:22 +03:00
|
|
|
sliders.get_mut(name).unwrap().set_pos(top_left);
|
2019-12-21 02:56:04 +03:00
|
|
|
}
|
2020-01-02 20:35:41 +03:00
|
|
|
WidgetType::Menu(ref name) => {
|
|
|
|
menus.get_mut(name).unwrap().set_pos(top_left);
|
|
|
|
}
|
2019-12-25 23:01:51 +03:00
|
|
|
WidgetType::Filler(ref name) => {
|
|
|
|
fillers.get_mut(name).unwrap().set_pos(top_left);
|
|
|
|
}
|
2019-12-21 02:56:04 +03:00
|
|
|
WidgetType::DurationPlot(ref mut widget) => {
|
2019-12-24 02:00:22 +03:00
|
|
|
widget.set_pos(top_left);
|
2019-12-21 02:56:04 +03:00
|
|
|
}
|
|
|
|
WidgetType::UsizePlot(ref mut widget) => {
|
2019-12-24 02:00:22 +03:00
|
|
|
widget.set_pos(top_left);
|
2019-12-21 02:56:04 +03:00
|
|
|
}
|
2019-12-29 19:16:38 +03:00
|
|
|
WidgetType::Histogram(ref mut widget) => {
|
|
|
|
widget.set_pos(top_left);
|
|
|
|
}
|
2019-12-21 02:56:04 +03:00
|
|
|
WidgetType::Row(ref mut widgets) => {
|
|
|
|
// layout() doesn't return absolute position; it's relative to the container.
|
|
|
|
for widget in widgets {
|
2019-12-24 02:00:22 +03:00
|
|
|
widget.apply_flexbox(
|
|
|
|
sliders,
|
2020-01-02 20:35:41 +03:00
|
|
|
menus,
|
2019-12-25 23:01:51 +03:00
|
|
|
fillers,
|
2019-12-24 02:00:22 +03:00
|
|
|
stretch,
|
|
|
|
nodes,
|
|
|
|
x + dx,
|
|
|
|
y + dy,
|
|
|
|
scroll_y_offset,
|
|
|
|
ctx,
|
|
|
|
);
|
2019-12-21 02:56:04 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
WidgetType::Column(ref mut widgets) => {
|
|
|
|
for widget in widgets {
|
2019-12-24 02:00:22 +03:00
|
|
|
widget.apply_flexbox(
|
|
|
|
sliders,
|
2020-01-02 20:35:41 +03:00
|
|
|
menus,
|
2019-12-25 23:01:51 +03:00
|
|
|
fillers,
|
2019-12-24 02:00:22 +03:00
|
|
|
stretch,
|
|
|
|
nodes,
|
|
|
|
x + dx,
|
|
|
|
y + dy,
|
|
|
|
scroll_y_offset,
|
|
|
|
ctx,
|
|
|
|
);
|
2019-12-21 02:56:04 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn get_all_click_actions(&self, actions: &mut HashSet<String>) {
|
|
|
|
match self.widget {
|
|
|
|
WidgetType::Draw(_)
|
|
|
|
| WidgetType::Slider(_)
|
2020-01-02 20:35:41 +03:00
|
|
|
| WidgetType::Menu(_)
|
2019-12-25 23:01:51 +03:00
|
|
|
| WidgetType::Filler(_)
|
2019-12-21 02:56:04 +03:00
|
|
|
| WidgetType::DurationPlot(_)
|
|
|
|
| WidgetType::UsizePlot(_) => {}
|
2019-12-29 19:16:38 +03:00
|
|
|
WidgetType::Histogram(_) => {}
|
2019-12-21 02:56:04 +03:00
|
|
|
WidgetType::Btn(ref btn) => {
|
|
|
|
if actions.contains(&btn.action) {
|
|
|
|
panic!(
|
|
|
|
"Two buttons in one Composite both use action {}",
|
|
|
|
btn.action
|
|
|
|
);
|
|
|
|
}
|
|
|
|
actions.insert(btn.action.clone());
|
|
|
|
}
|
|
|
|
WidgetType::Row(ref widgets) | WidgetType::Column(ref widgets) => {
|
|
|
|
for w in widgets {
|
|
|
|
w.get_all_click_actions(actions);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-01-07 21:08:39 +03:00
|
|
|
pub struct CompositeBuilder {
|
|
|
|
top_level: ManagedWidget,
|
|
|
|
pos: CompositePosition,
|
|
|
|
sliders: HashMap<String, Slider>,
|
|
|
|
menus: HashMap<String, Menu>,
|
|
|
|
fillers: HashMap<String, Filler>,
|
|
|
|
}
|
|
|
|
|
2019-12-21 02:56:04 +03:00
|
|
|
pub struct Composite {
|
|
|
|
top_level: ManagedWidget,
|
|
|
|
pos: CompositePosition,
|
2019-12-22 21:26:48 +03:00
|
|
|
|
2019-12-24 01:33:43 +03:00
|
|
|
sliders: HashMap<String, Slider>,
|
2020-01-02 20:35:41 +03:00
|
|
|
menus: HashMap<String, Menu>,
|
2019-12-25 23:01:51 +03:00
|
|
|
fillers: HashMap<String, Filler>,
|
2019-12-24 01:33:43 +03:00
|
|
|
|
2019-12-22 21:26:48 +03:00
|
|
|
// TODO This doesn't clip. There's no way to express that the scrollable thing should occupy a
|
|
|
|
// small part of the screen.
|
|
|
|
// TODO Horizontal scrolling?
|
|
|
|
scrollable: bool,
|
2019-12-21 02:56:04 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
pub enum Outcome {
|
|
|
|
Clicked(String),
|
|
|
|
}
|
|
|
|
|
|
|
|
enum CompositePosition {
|
|
|
|
FillScreen,
|
|
|
|
MinimalTopLeft(ScreenPt),
|
|
|
|
Aligned(HorizontalAlignment, VerticalAlignment),
|
|
|
|
}
|
|
|
|
|
2019-12-22 21:26:48 +03:00
|
|
|
const SCROLL_SPEED: f64 = 5.0;
|
|
|
|
|
2020-01-02 20:35:41 +03:00
|
|
|
// TODO These APIs aren't composable. Need a builer pattern or ideally, to scrape all the special
|
|
|
|
// objects from the tree.
|
2019-12-21 02:56:04 +03:00
|
|
|
impl Composite {
|
2020-01-07 21:08:39 +03:00
|
|
|
pub fn new(top_level: ManagedWidget) -> CompositeBuilder {
|
|
|
|
CompositeBuilder {
|
2019-12-21 02:56:04 +03:00
|
|
|
top_level,
|
2020-01-07 21:08:39 +03:00
|
|
|
pos: CompositePosition::FillScreen,
|
2019-12-24 01:33:43 +03:00
|
|
|
sliders: HashMap::new(),
|
2020-01-02 20:35:41 +03:00
|
|
|
menus: HashMap::new(),
|
2019-12-25 23:01:51 +03:00
|
|
|
fillers: HashMap::new(),
|
2019-12-24 01:33:43 +03:00
|
|
|
}
|
2019-12-22 21:26:48 +03:00
|
|
|
}
|
|
|
|
|
2019-12-24 01:33:43 +03:00
|
|
|
fn recompute_layout(&mut self, ctx: &EventCtx) {
|
2019-12-21 02:56:04 +03:00
|
|
|
let mut stretch = Stretch::new();
|
|
|
|
let root = stretch
|
|
|
|
.new_node(
|
|
|
|
match self.pos {
|
|
|
|
CompositePosition::FillScreen => Style {
|
|
|
|
size: Size {
|
|
|
|
width: Dimension::Points(ctx.canvas.window_width as f32),
|
|
|
|
height: Dimension::Points(ctx.canvas.window_height as f32),
|
|
|
|
},
|
|
|
|
..Default::default()
|
|
|
|
},
|
|
|
|
CompositePosition::MinimalTopLeft(_) | CompositePosition::Aligned(_, _) => {
|
|
|
|
Style {
|
|
|
|
// TODO There a way to encode the offset in stretch?
|
|
|
|
..Default::default()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
},
|
|
|
|
Vec::new(),
|
|
|
|
)
|
|
|
|
.unwrap();
|
|
|
|
|
|
|
|
let mut nodes = vec![];
|
2020-01-02 20:35:41 +03:00
|
|
|
self.top_level.get_flexbox(
|
|
|
|
root,
|
|
|
|
&self.sliders,
|
|
|
|
&self.menus,
|
|
|
|
&self.fillers,
|
|
|
|
&mut stretch,
|
|
|
|
&mut nodes,
|
|
|
|
);
|
2019-12-21 02:56:04 +03:00
|
|
|
nodes.reverse();
|
|
|
|
|
|
|
|
stretch.compute_layout(root, Size::undefined()).unwrap();
|
|
|
|
let top_left = match self.pos {
|
|
|
|
CompositePosition::FillScreen => ScreenPt::new(0.0, 0.0),
|
|
|
|
CompositePosition::MinimalTopLeft(pt) => pt,
|
|
|
|
CompositePosition::Aligned(horiz, vert) => {
|
|
|
|
let result = stretch.layout(root).unwrap();
|
|
|
|
ctx.canvas.align_window(
|
|
|
|
ScreenDims::new(result.size.width.into(), result.size.height.into()),
|
|
|
|
horiz,
|
|
|
|
vert,
|
|
|
|
)
|
|
|
|
}
|
|
|
|
};
|
2019-12-24 02:00:22 +03:00
|
|
|
let offset = self.scroll_y_offset(ctx);
|
2019-12-21 02:56:04 +03:00
|
|
|
self.top_level.apply_flexbox(
|
2019-12-24 01:33:43 +03:00
|
|
|
&mut self.sliders,
|
2020-01-02 20:35:41 +03:00
|
|
|
&mut self.menus,
|
2019-12-25 23:01:51 +03:00
|
|
|
&mut self.fillers,
|
2019-12-21 02:56:04 +03:00
|
|
|
&stretch,
|
|
|
|
&mut nodes,
|
|
|
|
top_left.x,
|
2019-12-24 02:00:22 +03:00
|
|
|
top_left.y,
|
|
|
|
offset,
|
2019-12-21 02:56:04 +03:00
|
|
|
ctx,
|
|
|
|
);
|
|
|
|
assert!(nodes.is_empty());
|
|
|
|
}
|
|
|
|
|
2019-12-24 02:00:22 +03:00
|
|
|
fn scroll_y_offset(&self, ctx: &EventCtx) -> f64 {
|
|
|
|
if self.scrollable {
|
|
|
|
self.slider("scrollbar").get_percent()
|
|
|
|
* (self.top_level.rect.height() - ctx.canvas.window_height).max(0.0)
|
|
|
|
} else {
|
|
|
|
0.0
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn set_scroll_y_offset(&mut self, ctx: &EventCtx, offset: f64) {
|
|
|
|
assert!(self.scrollable);
|
|
|
|
let max = (self.top_level.rect.height() - ctx.canvas.window_height).max(0.0);
|
|
|
|
if max == 0.0 {
|
|
|
|
assert_eq!(offset, 0.0);
|
|
|
|
self.mut_slider("scrollbar").set_percent(ctx, 0.0);
|
|
|
|
} else {
|
|
|
|
self.mut_slider("scrollbar").set_percent(ctx, offset / max);
|
|
|
|
}
|
|
|
|
self.recompute_layout(ctx);
|
|
|
|
}
|
|
|
|
|
2019-12-21 02:56:04 +03:00
|
|
|
pub fn event(&mut self, ctx: &mut EventCtx) -> Option<Outcome> {
|
2019-12-22 21:26:48 +03:00
|
|
|
if self.scrollable
|
|
|
|
&& self
|
|
|
|
.top_level
|
|
|
|
.rect
|
|
|
|
.contains(ctx.canvas.get_cursor_in_screen_space())
|
|
|
|
{
|
|
|
|
if let Some(scroll) = ctx.input.get_mouse_scroll() {
|
2019-12-24 02:00:22 +03:00
|
|
|
let offset = self.scroll_y_offset(ctx) - scroll * SCROLL_SPEED;
|
2019-12-22 21:26:48 +03:00
|
|
|
let max = (self.top_level.rect.height() - ctx.canvas.window_height).max(0.0);
|
2019-12-24 02:00:22 +03:00
|
|
|
// TODO Do the clamping in there instead
|
|
|
|
self.set_scroll_y_offset(ctx, abstutil::clamp(offset, 0.0, max));
|
2019-12-22 21:26:48 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-12-21 02:56:04 +03:00
|
|
|
if ctx.input.is_window_resized() {
|
2019-12-24 01:33:43 +03:00
|
|
|
self.recompute_layout(ctx);
|
2019-12-21 02:56:04 +03:00
|
|
|
}
|
2019-12-22 21:26:48 +03:00
|
|
|
|
2019-12-24 02:00:22 +03:00
|
|
|
let before = self.scroll_y_offset(ctx);
|
2020-01-02 20:35:41 +03:00
|
|
|
let result = self
|
|
|
|
.top_level
|
|
|
|
.event(ctx, &mut self.sliders, &mut self.menus);
|
2019-12-24 02:00:22 +03:00
|
|
|
if self.scroll_y_offset(ctx) != before {
|
|
|
|
self.recompute_layout(ctx);
|
|
|
|
}
|
|
|
|
result
|
2019-12-21 02:56:04 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
pub fn draw(&self, g: &mut GfxCtx) {
|
|
|
|
g.canvas.mark_covered_area(self.top_level.rect.clone());
|
2020-01-02 20:35:41 +03:00
|
|
|
self.top_level.draw(g, &self.sliders, &self.menus);
|
2019-12-21 02:56:04 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
pub fn get_all_click_actions(&self) -> HashSet<String> {
|
|
|
|
let mut actions = HashSet::new();
|
|
|
|
self.top_level.get_all_click_actions(&mut actions);
|
|
|
|
actions
|
|
|
|
}
|
|
|
|
|
2019-12-24 02:00:22 +03:00
|
|
|
pub fn preserve_scroll(&self, ctx: &EventCtx) -> f64 {
|
2019-12-22 21:26:48 +03:00
|
|
|
assert!(self.scrollable);
|
2019-12-24 02:00:22 +03:00
|
|
|
self.scroll_y_offset(ctx)
|
2019-12-21 02:56:04 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
pub fn restore_scroll(&mut self, ctx: &EventCtx, offset: f64) {
|
2019-12-22 21:26:48 +03:00
|
|
|
assert!(self.scrollable);
|
2019-12-24 02:00:22 +03:00
|
|
|
self.set_scroll_y_offset(ctx, offset);
|
2019-12-24 01:33:43 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
pub fn slider(&self, name: &str) -> &Slider {
|
|
|
|
&self.sliders[name]
|
|
|
|
}
|
|
|
|
pub fn mut_slider(&mut self, name: &str) -> &mut Slider {
|
|
|
|
self.sliders.get_mut(name).unwrap()
|
|
|
|
}
|
|
|
|
pub fn take_slider(&mut self, name: &str) -> Slider {
|
|
|
|
self.sliders.remove(name).unwrap()
|
2019-12-21 02:56:04 +03:00
|
|
|
}
|
2019-12-25 23:01:51 +03:00
|
|
|
|
2020-01-02 20:35:41 +03:00
|
|
|
pub fn menu(&self, name: &str) -> &Menu {
|
|
|
|
&self.menus[name]
|
|
|
|
}
|
|
|
|
|
2019-12-25 23:01:51 +03:00
|
|
|
pub fn filler_rect(&self, name: &str) -> ScreenRectangle {
|
|
|
|
let f = &self.fillers[name];
|
|
|
|
ScreenRectangle::top_left(f.top_left, f.dims)
|
|
|
|
}
|
2019-12-21 02:56:04 +03:00
|
|
|
}
|
2020-01-07 21:08:39 +03:00
|
|
|
|
|
|
|
impl CompositeBuilder {
|
|
|
|
pub fn build(self, ctx: &mut EventCtx) -> Composite {
|
|
|
|
let mut c = Composite {
|
|
|
|
top_level: self.top_level,
|
|
|
|
pos: self.pos,
|
|
|
|
sliders: self.sliders,
|
|
|
|
menus: self.menus,
|
|
|
|
fillers: self.fillers,
|
|
|
|
scrollable: false,
|
|
|
|
};
|
|
|
|
c.recompute_layout(ctx);
|
|
|
|
ctx.fake_mouseover(|ctx| assert!(c.event(ctx).is_none()));
|
|
|
|
c
|
|
|
|
}
|
|
|
|
pub fn build_scrollable(self, ctx: &mut EventCtx) -> Composite {
|
|
|
|
let mut c = Composite {
|
|
|
|
top_level: self.top_level,
|
|
|
|
pos: self.pos,
|
|
|
|
sliders: self.sliders,
|
|
|
|
menus: self.menus,
|
|
|
|
fillers: self.fillers,
|
|
|
|
scrollable: false,
|
|
|
|
};
|
|
|
|
c.pos = CompositePosition::Aligned(HorizontalAlignment::Left, VerticalAlignment::Top);
|
|
|
|
// If the panel fits without a scrollbar, don't add one.
|
|
|
|
c.recompute_layout(ctx);
|
|
|
|
if c.top_level.rect.height() > ctx.canvas.window_height {
|
|
|
|
c.scrollable = true;
|
|
|
|
c.sliders.insert(
|
|
|
|
"scrollbar".to_string(),
|
|
|
|
Slider::vertical(ctx, ctx.canvas.window_height),
|
|
|
|
);
|
|
|
|
c.top_level = ManagedWidget::row(vec![c.top_level, ManagedWidget::slider("scrollbar")]);
|
|
|
|
c.recompute_layout(ctx);
|
|
|
|
}
|
|
|
|
ctx.fake_mouseover(|ctx| assert!(c.event(ctx).is_none()));
|
|
|
|
c
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn minimal_size(mut self, top_left: ScreenPt) -> CompositeBuilder {
|
|
|
|
self.pos = CompositePosition::MinimalTopLeft(top_left);
|
|
|
|
self
|
|
|
|
}
|
|
|
|
pub fn aligned(
|
|
|
|
mut self,
|
|
|
|
horiz: HorizontalAlignment,
|
|
|
|
vert: VerticalAlignment,
|
|
|
|
) -> CompositeBuilder {
|
|
|
|
self.pos = CompositePosition::Aligned(horiz, vert);
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn filler(mut self, name: &str, filler: Filler) -> CompositeBuilder {
|
|
|
|
self.fillers.insert(name.to_string(), filler);
|
|
|
|
self
|
|
|
|
}
|
|
|
|
pub fn slider(mut self, name: &str, slider: Slider) -> CompositeBuilder {
|
|
|
|
self.sliders.insert(name.to_string(), slider);
|
|
|
|
self
|
|
|
|
}
|
|
|
|
pub fn menu(mut self, name: &str, menu: Menu) -> CompositeBuilder {
|
|
|
|
self.menus.insert(name.to_string(), menu);
|
|
|
|
self
|
|
|
|
}
|
|
|
|
}
|