From 611eaa52e8f669d8972588473413d413507bea32 Mon Sep 17 00:00:00 2001 From: Lampsitter <96946613+lampsitter@users.noreply.github.com> Date: Sun, 9 Jan 2022 15:32:09 +0100 Subject: [PATCH] Revert "Don't constrain immovable egui windows to native window (#1049)" (#1054) This reverts commit 7b641be7b06be8b81b66d63968f081718acc7c89. It accidentally disabled constraining for all windows --- CHANGELOG.md | 1 - egui/src/containers/window.rs | 14 ++++---------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0093f20a..be641726 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,7 +15,6 @@ NOTE: [`epaint`](epaint/CHANGELOG.md), [`eframe`](eframe/CHANGELOG.md), [`egui_w ### Fixed 🐛 * Context menu now respects the theme ([#1043](https://github.com/emilk/egui/pull/1043)) -* Immovable windows can no longer incorrectly move ([#1049](https://github.com/emilk/egui/pull/1049)) ## 0.16.1 - 2021-12-31 - Add back `CtxRef::begin_frame,end_frame` diff --git a/egui/src/containers/window.rs b/egui/src/containers/window.rs index 3c80a5d0..4eceac70 100644 --- a/egui/src/containers/window.rs +++ b/egui/src/containers/window.rs @@ -399,11 +399,9 @@ impl<'open> Window<'open> { content_inner }; - if area.movable { - area.state_mut().pos = ctx - .constrain_window_rect_to_area(area.state().rect(), area.drag_bounds()) - .min; - } + area.state_mut().pos = ctx + .constrain_window_rect_to_area(area.state().rect(), area.drag_bounds()) + .min; let full_response = area.end(ctx, area_content_ui); @@ -510,11 +508,7 @@ fn interact( let new_rect = move_and_resize_window(ctx, &window_interaction)?; let new_rect = ctx.round_rect_to_pixels(new_rect); - let new_rect = if area.movable { - ctx.constrain_window_rect_to_area(new_rect, area.drag_bounds()) - } else { - new_rect - }; + let new_rect = ctx.constrain_window_rect_to_area(new_rect, area.drag_bounds()); // TODO: add this to a Window state instead as a command "move here next frame" area.state_mut().pos = new_rect.min;