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

Let 1D strips fill up parent width/height

Browse source
This commit is contained in:
Emil Ernerfeldt 2022-03-31 21:08:43 +02:00
parent 04135aaa9c
commit 8718ae6c59
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
egui_extras/src/layout.rs
View file

@ -99,10 +99,9 @@ impl<'l> StripLayout<'l> {
add_contents: impl FnOnce(&mut Ui), add_contents: impl FnOnce(&mut Ui),
) -> Response { ) -> Response {
let rect = self.cell_rect(&width, &height); let rect = self.cell_rect(&width, &height);
self.cell(rect, clip, add_contents); let used_rect = self.cell(rect, clip, add_contents);
self.set_pos(rect); self.set_pos(rect);
self.ui.allocate_rect(rect.union(used_rect), Sense::click())
self.ui.allocate_rect(rect, Sense::click())
} }
pub(crate) fn add_striped( pub(crate) fn add_striped(
@ -138,7 +137,7 @@ impl<'l> StripLayout<'l> {
} }
} }
fn cell(&mut self, rect: Rect, clip: bool, add_contents: impl FnOnce(&mut Ui)) { fn cell(&mut self, rect: Rect, clip: bool, add_contents: impl FnOnce(&mut Ui)) -> Rect {
let mut child_ui = self.ui.child_ui(rect, *self.ui.layout()); let mut child_ui = self.ui.child_ui(rect, *self.ui.layout());
if clip { if clip {
@ -149,6 +148,7 @@ impl<'l> StripLayout<'l> {
} }
add_contents(&mut child_ui); add_contents(&mut child_ui);
child_ui.min_rect()
} }
/// Allocate the rect in [`Self::ui`] so that the scrollview knows about our size /// Allocate the rect in [`Self::ui`] so that the scrollview knows about our size