migrations/egui
1
0
Fork 0
mirror of https://github.com/emilk/egui.git synced 2026-09-03 07:10:04 -04:00
Code Activity

layout: don't return negative availability rectangles

Browse Source
This commit is contained in:
Emil Ernerfeldt
2021-03-21 19:57:38 +01:00
parent f5c372910c
commit 05308e8d37
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
egui/src/layout.rs
View File

@@ -411,6 +411,8 @@ impl Layout {
avail.min.y = cursor.min.y; avail.min.y = cursor.min.y;
avail.max.y = cursor.max.y; avail.max.y = cursor.max.y;
} }
avail.max.x = avail.max.x.max(avail.min.x);
avail.max.y = avail.max.y.max(avail.min.y);
} }
Direction::RightToLeft => { Direction::RightToLeft => {
avail.max.x = cursor.max.x; avail.max.x = cursor.max.x;
@@ -419,6 +421,8 @@ impl Layout {
avail.min.y = cursor.min.y; avail.min.y = cursor.min.y;
avail.max.y = cursor.max.y; avail.max.y = cursor.max.y;
} }
avail.min.x = avail.min.x.min(avail.max.x);
avail.max.y = avail.max.y.max(avail.min.y);
} }
Direction::TopDown => { Direction::TopDown => {
avail.min.y = cursor.min.y; avail.min.y = cursor.min.y;
@@ -427,6 +431,8 @@ impl Layout {
avail.min.x = cursor.min.x; avail.min.x = cursor.min.x;
avail.max.x = cursor.max.x; avail.max.x = cursor.max.x;
} }
avail.max.x = avail.max.x.max(avail.min.x);
avail.max.y = avail.max.y.max(avail.min.y);
} }
Direction::BottomUp => { Direction::BottomUp => {
avail.min.y = avail.min.y.min(cursor.max.y); avail.min.y = avail.min.y.min(cursor.max.y);
@@ -434,6 +440,8 @@ impl Layout {
avail.min.x = cursor.min.x; avail.min.x = cursor.min.x;
avail.max.x = cursor.max.x; avail.max.x = cursor.max.x;
} }
avail.max.x = avail.max.x.max(avail.min.x);
avail.min.y = avail.min.y.min(avail.max.y);
} }
} }