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

Better auto-sizing of windows

Browse source
This commit is contained in:
Emil Ernerfeldt 2020-05-10 19:00:48 +02:00
parent 274acff47e
commit 9dab3628a1
2 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
emigui/src/containers/resize.rs
View file

@ -74,8 +74,10 @@ impl Resize {
self self
} }
/// Not resizable, just takes the size of its contents.
pub fn auto_sized(self) -> Self { pub fn auto_sized(self) -> Self {
self.resizable(false) self.default_size(Vec2::splat(f32::INFINITY))
.resizable(false)
.auto_shrink_width(true) .auto_shrink_width(true)
.auto_expand_width(true) .auto_expand_width(true)
.auto_shrink_height(true) .auto_shrink_height(true)

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

@ -10,7 +10,7 @@ pub struct Window {
pub area: Area, pub area: Area,
pub frame: Option<Frame>, pub frame: Option<Frame>,
pub resize: Resize, pub resize: Resize,
pub scroll: ScrollArea, pub scroll: Option<ScrollArea>,
} }
impl Window { impl Window {
@ -31,9 +31,11 @@ impl Window {
.auto_expand_width(true) .auto_expand_width(true)
.auto_shrink_height(false) .auto_shrink_height(false)
.auto_expand_height(false), .auto_expand_height(false),
scroll: ScrollArea::default() scroll: Some(
ScrollArea::default()
.always_show_scroll(false) .always_show_scroll(false)
.max_height(f32::INFINITY), // As large as we can be .max_height(f32::INFINITY),
), // As large as we can be
} }
} }
@ -82,9 +84,16 @@ impl Window {
self.resize = self.resize.resizable(resizable); self.resize = self.resize.resizable(resizable);
self self
} }
/// Not resizable, just takes the size of its contents.
pub fn auto_sized(mut self) -> Self {
self.resize = self.resize.auto_sized();
self.scroll = None;
self
}
} }
impl Window { impl<'open> Window<'open> {
pub fn show(self, ctx: &Arc<Context>, add_contents: impl FnOnce(&mut Ui)) -> InteractInfo { pub fn show(self, ctx: &Arc<Context>, add_contents: impl FnOnce(&mut Ui)) -> InteractInfo {
let Window { let Window {
title_label, title_label,
@ -101,7 +110,12 @@ impl Window {
resize.show(ui, |ui| { resize.show(ui, |ui| {
ui.add(title_label); ui.add(title_label);
ui.add(Separator::new().line_width(1.0)); // TODO: nicer way to split window title from contents ui.add(Separator::new().line_width(1.0)); // TODO: nicer way to split window title from contents
if let Some(scroll) = scroll {
scroll.show(ui, add_contents) scroll.show(ui, add_contents)
} else {
add_contents(ui)
}
}) })
}) })
}) })