From 4ebaa53fead7686d1d75fcace3e4b3eb23f633b3 Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Wed, 13 Jan 2021 22:07:13 +0100 Subject: [PATCH] Fix problem with having a grid in an infinitely sized ui --- egui/src/grid.rs | 4 ++++ egui/src/placer.rs | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/egui/src/grid.rs b/egui/src/grid.rs index d30ba63d..d774d52f 100644 --- a/egui/src/grid.rs +++ b/egui/src/grid.rs @@ -96,6 +96,10 @@ impl GridLayout { Rect::from_min_max(region.cursor, region.max_rect.max) } + pub(crate) fn available_rect_finite(&self, region: &Region) -> Rect { + Rect::from_min_max(region.cursor, region.max_rect_finite().max) + } + pub(crate) fn next_cell(&self, cursor: Pos2, child_size: Vec2) -> Rect { let width = self.state.col_width(self.col).unwrap_or(0.0); let height = self.row_height(self.row); diff --git a/egui/src/placer.rs b/egui/src/placer.rs index 75107294..2fbe2642 100644 --- a/egui/src/placer.rs +++ b/egui/src/placer.rs @@ -65,7 +65,7 @@ impl Placer { pub(crate) fn available_rect_before_wrap_finite(&self) -> Rect { if let Some(grid) = &self.grid { - grid.available_rect(&self.region) + grid.available_rect_finite(&self.region) } else { self.layout.available_rect_before_wrap_finite(&self.region) }