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

Fix problem with having a grid in an infinitely sized ui

Browse source
This commit is contained in:
Emil Ernerfeldt 2021-01-13 22:07:13 +01:00
parent b10dcf5012
commit 4ebaa53fea
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
egui/src/grid.rs
View file

@ -96,6 +96,10 @@ impl GridLayout {
Rect::from_min_max(region.cursor, region.max_rect.max) 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 { 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 width = self.state.col_width(self.col).unwrap_or(0.0);
let height = self.row_height(self.row); let height = self.row_height(self.row);

2
egui/src/placer.rs
View file

@ -65,7 +65,7 @@ impl Placer {
pub(crate) fn available_rect_before_wrap_finite(&self) -> Rect { pub(crate) fn available_rect_before_wrap_finite(&self) -> Rect {
if let Some(grid) = &self.grid { if let Some(grid) = &self.grid {
grid.available_rect(&self.region) grid.available_rect_finite(&self.region)
} else { } else {
self.layout.available_rect_before_wrap_finite(&self.region) self.layout.available_rect_before_wrap_finite(&self.region)
} }