Nicer looking indent regions with a gray vertical line

This commit is contained in:
Emil Ernerfeldt 2020-04-21 10:28:25 +02:00
parent b89ab7aa3f
commit ed67cc6e59
3 changed files with 23 additions and 11 deletions

View file

@ -1,6 +1,6 @@
use std::{hash::Hash, sync::Arc};
use crate::{font::TextFragment, layout::*, widgets::*, *};
use crate::{color::*, font::TextFragment, layout::*, widgets::*, *};
/// Represents a region of the screen
/// with a type of layout (horizontal or vertical).
@ -218,27 +218,28 @@ impl Region {
);
if open {
let old_id = self.id;
self.id = id;
self.indent(add_contents);
self.id = old_id;
self.indent(id, add_contents);
}
self.response(interact)
}
/// Create a child region which is indented to the right
pub fn indent<F>(&mut self, add_contents: F)
pub fn indent<F>(&mut self, id: Id, add_contents: F)
where
F: FnOnce(&mut Region),
{
assert!(
self.dir == Direction::Vertical,
"You can only indent vertical layouts"
);
let indent = vec2(self.style.indent, 0.0);
let child_rect = Rect::from_min_max(self.cursor + indent, self.desired_rect.max());
let mut child_region = Region {
ctx: self.ctx.clone(),
id,
layer: self.layer,
style: self.style,
id: self.id,
clip_rect: self.clip_rect.intersect(child_rect),
desired_rect: child_rect,
bounding_size: vec2(0.0, 0.0),
@ -248,6 +249,17 @@ impl Region {
};
add_contents(&mut child_region);
let size = child_region.bounding_size;
// draw a grey line on the left to mark the region
let line_start = child_rect.min() - indent + vec2(13.0, 2.0);
let line_start = line_start.round();
let line_end = pos2(line_start.x, line_start.y + size.y - 8.0);
self.add_paint_cmd(PaintCmd::Line {
points: vec![line_start, line_end],
color: gray(150, 255),
width: self.style.line_width,
});
self.reserve_space_without_padding(indent + size);
}

View file

@ -43,7 +43,7 @@ impl Default for Style {
indent: 21.0,
clickable_diameter: 34.0,
start_icon_width: 20.0,
line_width: 2.0,
line_width: 1.0,
window: Window::default(),
}
}

View file

@ -58,7 +58,7 @@ impl State {
region.set_align(Align::Min);
region.add_label("WebGl painter info:");
region.indent(|region| {
region.indent(Id::new(&"webgl region"), |region| {
region.add_label(self.webgl_painter.debug_info());
});
region.add(