djkato/egui
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Keep window title and collapsing headers on one line

Browse source
This commit is contained in:
Emil Ernerfeldt 2020-05-08 17:16:32 +02:00
parent 570215df9a
commit 702e135f07
6 changed files with 114 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
emigui/src/containers/collapsing_header.rs
View file

@ -1,4 +1,4 @@
use crate::{layout::Direction, *};
use crate::{layout::Direction, widgets::Label, *};
#[derive(Clone, Copy, Debug, serde_derive::Deserialize, serde_derive::Serialize)]
#[serde(default)]
@ -23,14 +23,16 @@ impl Default for State {
}
pub struct CollapsingHeader {
title: String,
label: Label,
default_open: bool,
}
impl CollapsingHeader {
pub fn new(title: impl Into<String>) -> Self {
pub fn new(label: impl Into<String>) -> Self {
Self {
title: title.into(),
label: Label::new(label)
.text_style(TextStyle::Button)
.multiline(false),
default_open: false,
}
}
@ -48,22 +50,27 @@ impl CollapsingHeader {
"Horizontal collapsing is unimplemented"
);
let Self {
title,
label,
default_open,
} = self;
let id = region.make_unique_id(&title);
let text_style = TextStyle::Button;
let font = &region.fonts()[text_style];
let (title, text_size) = font.layout_multiline(&title, region.available_width());
// TODO: horizontal layout, with icon and text as labels. Inser background behind using Frame.
let title = &label.text; // TODO: not this
let id = region.make_unique_id(title);
let text_pos = region.cursor() + vec2(region.style().indent, 0.0);
let (title, text_size) = label.layout(text_pos, region);
let text_max_x = text_pos.x + text_size.x;
let desired_width = region.available_width().max(text_max_x - region.cursor().x);
let interact = region.reserve_space(
vec2(
region.available_width(),
desired_width,
text_size.y + 2.0 * region.style().button_padding.y,
),
Some(id),
);
let text_pos = pos2(text_pos.x, interact.rect.center().y - text_size.y / 2.0);
let mut state = {
let mut memory = region.memory();
@ -78,25 +85,29 @@ impl CollapsingHeader {
*state
};
region.add_paint_cmd(PaintCmd::Rect {
corner_radius: region.style().interact_corner_radius(&interact),
fill_color: region.style().interact_fill_color(&interact),
outline: region.style().interact_outline(&interact),
rect: interact.rect,
});
let where_to_put_background = region.paint_list_len();
paint_icon(region, &state, &interact);
region.add_text(
pos2(
interact.rect.left() + region.style().indent,
interact.rect.center().y - text_size.y / 2.0,
),
text_style,
text_pos,
label.text_style,
title,
Some(region.style().interact_stroke_color(&interact)),
);
region.insert_paint_cmd(
where_to_put_background,
PaintCmd::Rect {
corner_radius: region.style().interact_corner_radius(&interact),
fill_color: region.style().interact_fill_color(&interact),
outline: region.style().interact_outline(&interact),
rect: interact.rect,
},
);
region.expand_to_include_child(interact.rect); // TODO: remove, just a test
let animation_time = region.style().animation_time;
let time_since_toggle = (region.input().time - state.toggle_time) as f32;
let time_since_toggle = time_since_toggle + region.input().dt; // Instant feedback

13
emigui/src/containers/frame.rs
View file

@ -3,12 +3,21 @@
use crate::*;
#[derive(Clone, Debug, Default)]
pub struct Frame {}
pub struct Frame {
pub margin: Option<Vec2>,
}
impl Frame {
pub fn margin(mut self, margin: Vec2) -> Self {
self.margin = Some(margin);
self
}
}
impl Frame {
pub fn show(self, region: &mut Region, add_contents: impl FnOnce(&mut Region)) {
let style = region.style();
let margin = style.window_padding;
let margin = self.margin.unwrap_or_default();
let outer_pos = region.cursor();
let inner_rect =

20
emigui/src/containers/window.rs
View file

@ -5,9 +5,8 @@ use crate::{widgets::*, *};
use super::*;
/// A wrapper around other containers for things you often want in a window
#[derive(Clone, Debug)]
pub struct Window {
pub title: String,
pub title_label: Label,
pub floating: Floating,
pub frame: Frame,
pub resize: Resize,
@ -15,11 +14,16 @@ pub struct Window {
}
impl Window {
// TODO: Into<Label>
pub fn new(title: impl Into<String>) -> Self {
let title = title.into();
let floating = Floating::new(&title);
let title_label = Label::new(title)
.text_style(TextStyle::Heading)
.multiline(false);
Self {
title: title.clone(),
floating: Floating::new(title),
title_label,
floating,
frame: Frame::default(),
resize: Resize::default()
.handle_offset(Vec2::splat(4.0))
@ -83,17 +87,19 @@ impl Window {
impl Window {
pub fn show(self, ctx: &Arc<Context>, add_contents: impl FnOnce(&mut Region)) {
let Window {
title,
title_label,
floating,
frame,
mut frame,
resize,
scroll,
} = self;
frame.margin = Some(frame.margin.unwrap_or_else(|| ctx.style().window_padding));
// TODO: easier way to compose these
floating.show(ctx, |region| {
frame.show(region, |region| {
resize.show(region, |region| {
region.add(Label::new(title).text_style(TextStyle::Heading));
region.add(title_label);
region.add(Separator::new().line_width(1.0)); // TODO: nicer way to split window title from contents
scroll.show(region, |region| add_contents(region))
})

18
emigui/src/region.rs
View file

@ -19,7 +19,7 @@ pub struct Region {
/// Where to put the graphics output of this Region
layer: Layer,
/// Everything painte in this rect will be clipped against this.
/// Everything painted in this region will be clipped against this.
/// This means nothing outside of this rectangle will be visible on screen.
clip_rect: Rect,
@ -28,12 +28,14 @@ pub struct Region {
/// Note that the size may be infinite in one or both dimensions.
/// The widgets will TRY to fit within the rect,
/// but may overflow (which you will see in child_bounds).
desired_rect: Rect, // TODO: rename?
/// Some widgets (like separator lines) will try to fill the full desired width of the region.
desired_rect: Rect, // TODO: rename as max_rect ?
/// Bounding box of all children.
/// This is used to see how large a region actually
/// needs to be after all children has been added.
child_bounds: Rect,
/// You can think of this as the minimum size.
child_bounds: Rect, // TODO: rename as min_rect ?
/// Overide default style in this region
style: Style,
@ -170,7 +172,7 @@ impl Region {
/// Set the width of the region.
/// You won't be able to shrink it beyond its current child bounds.
pub fn set_width(&mut self, width: f32) {
pub fn set_desired_width(&mut self, width: f32) {
let min_width = self.child_bounds.max.x - self.top_left().x;
let width = width.max(min_width);
self.desired_rect.max.x = self.top_left().x + width;
@ -178,7 +180,7 @@ impl Region {
/// Set the height of the region.
/// You won't be able to shrink it beyond its current child bounds.
pub fn set_height(&mut self, height: f32) {
pub fn set_desired_height(&mut self, height: f32) {
let min_height = self.child_bounds.max.y - self.top_left().y;
let height = height.max(min_height);
self.desired_rect.max.y = self.top_left().y + height;
@ -195,6 +197,10 @@ impl Region {
self.child_bounds.extend_with(rect.max);
}
pub fn expand_to_size(&mut self, size: Vec2) {
self.child_bounds.extend_with(self.top_left() + size);
}
/// Bounding box of all contained children
pub fn child_bounds(&self) -> Rect {
self.child_bounds
@ -258,6 +264,7 @@ impl Region {
IdSource: Hash + std::fmt::Debug,
{
let id = self.id.with(id_source);
// TODO: clip name clash error messages to clip rect
self.ctx.register_unique_id(id, id_source, self.cursor)
}
@ -434,6 +441,7 @@ impl Region {
self.debug_text_at(self.cursor, text);
}
// TODO: AsRef<str>
pub fn debug_text_at(&self, pos: Pos2, text: &str) {
self.ctx.debug_text(pos, text);
}

60
emigui/src/widgets.rs
View file

@ -20,10 +20,11 @@ pub trait Widget {
// ----------------------------------------------------------------------------
pub struct Label {
text: String,
multiline: bool,
text_style: TextStyle, // TODO: Option<TextStyle>, where None means "use the default for the region"
text_color: Option<Color>,
// TODO: not pub
pub(crate) text: String,
pub(crate) multiline: bool,
pub(crate) text_style: TextStyle, // TODO: Option<TextStyle>, where None means "use the default for the region"
pub(crate) text_color: Option<Color>,
}
impl Label {
@ -50,6 +51,24 @@ impl Label {
self.text_color = Some(text_color);
self
}
pub fn layout(&self, pos: Pos2, region: &Region) -> (Vec<font::TextFragment>, Vec2) {
let font = &region.fonts()[self.text_style];
let max_width = region.rect().right() - pos.x;
if self.multiline {
font.layout_multiline(&self.text, max_width)
} else {
font.layout_single_line(&self.text)
}
}
// TODO: this should return a LabelLayout which has a paint method.
// We can then split Widget::Ui in two: layout + allocating space, and painting.
// this allows us to assemble lables, THEN detect interaction, THEN chose color style based on that.
// pub fn layout(self, region: &mut region) -> LabelLayout { }
// TODO: a paint method for painting anywhere in a region.
// This should be the easiest method of putting text anywhere.
}
/// Usage: label!("Foo: {}", bar)
@ -61,18 +80,25 @@ macro_rules! label {
impl Widget for Label {
fn ui(self, region: &mut Region) -> GuiResponse {
let font = &region.fonts()[self.text_style];
let (text, text_size) = if self.multiline {
font.layout_multiline(&self.text, region.available_width())
} else {
font.layout_single_line(&self.text)
};
let (text, text_size) = self.layout(region.cursor(), region);
let interact = region.reserve_space(text_size, None);
region.add_text(interact.rect.min, self.text_style, text, self.text_color);
region.response(interact)
}
}
impl Into<Label> for &str {
fn into(self) -> Label {
Label::new(self)
}
}
impl Into<Label> for String {
fn into(self) -> Label {
Label::new(self)
}
}
// ----------------------------------------------------------------------------
pub struct Hyperlink {
@ -322,7 +348,7 @@ impl Widget for RadioButton {
pub struct Separator {
line_width: f32,
min_length: f32,
min_spacing: f32,
extra: f32,
color: Color,
}
@ -331,7 +357,7 @@ impl Separator {
pub fn new() -> Self {
Self {
line_width: 2.0,
min_length: 6.0,
min_spacing: 6.0,
extra: 0.0,
color: color::WHITE,
}
@ -342,8 +368,8 @@ impl Separator {
self
}
pub fn min_length(mut self, min_length: f32) -> Self {
self.min_length = min_length;
pub fn min_spacing(mut self, min_spacing: f32) -> Self {
self.min_spacing = min_spacing;
self
}
@ -365,7 +391,8 @@ impl Widget for Separator {
let extra = self.extra;
let (points, interact) = match region.direction() {
Direction::Horizontal => {
let interact = region.reserve_space(vec2(self.min_length, available_space.y), None);
let interact =
region.reserve_space(vec2(self.min_spacing, available_space.y), None);
(
vec![
pos2(interact.rect.center().x, interact.rect.top() - extra),
@ -375,7 +402,8 @@ impl Widget for Separator {
)
}
Direction::Vertical => {
let interact = region.reserve_space(vec2(available_space.x, self.min_length), None);
let interact =
region.reserve_space(vec2(available_space.x, self.min_spacing), None);
(
vec![
pos2(interact.rect.left() - extra, interact.rect.center().y),

2
emigui/src/widgets/slider.rs
View file

@ -127,7 +127,7 @@ impl<'a> Widget for Slider<'a> {
let slider_response = columns[0].add(slider_sans_text);
// Place the text in line with the slider on the left:
columns[1].set_height(slider_response.rect.height());
columns[1].set_desired_height(slider_response.rect.height());
columns[1].horizontal(|region| {
region.set_align(Align::Center);
region.add(Label::new(full_text).multiline(false));