Browse Source

Revert "Fix set_width/set_min_width/set_height/set_min_height"

This reverts commit 01d3f53113.
pull/652/head
Emil Ernerfeldt 3 years ago
parent
commit
c510899019
  1. 4
      CHANGELOG.md
  2. 6
      egui/src/placer.rs

4
CHANGELOG.md

@ -7,10 +7,6 @@ NOTE: [`eframe`](eframe/CHANGELOG.md), [`egui_web`](egui_web/CHANGELOG.md) and [
## Unreleased ## Unreleased
### Fixed 🐛
* Fix `set_width/set_min_width/set_height/set_min_height`
## 0.14.0 - 2021-08-24 - Ui panels and bug fixes ## 0.14.0 - 2021-08-24 - Ui panels and bug fixes

6
egui/src/placer.rs

@ -223,9 +223,6 @@ impl Placer {
region.max_rect.min.x = rect.min.x; region.max_rect.min.x = rect.min.x;
region.max_rect.max.x = rect.max.x; region.max_rect.max.x = rect.max.x;
region.max_rect = region.max_rect.union(region.min_rect); // make sure we didn't shrink too much region.max_rect = region.max_rect.union(region.min_rect); // make sure we didn't shrink too much
region.cursor.min.x = region.max_rect.min.x;
region.cursor.max.x = region.max_rect.max.x;
} }
/// Set the maximum height of the ui. /// Set the maximum height of the ui.
@ -236,9 +233,6 @@ impl Placer {
region.max_rect.min.y = rect.min.y; region.max_rect.min.y = rect.min.y;
region.max_rect.max.y = rect.max.y; region.max_rect.max.y = rect.max.y;
region.max_rect = region.max_rect.union(region.min_rect); // make sure we didn't shrink too much region.max_rect = region.max_rect.union(region.min_rect); // make sure we didn't shrink too much
region.cursor.min.y = region.max_rect.min.y;
region.cursor.max.y = region.max_rect.max.y;
} }
/// Set the minimum width of the ui. /// Set the minimum width of the ui.

Loading…
Cancel
Save