From ab517aa21d539c38f767ca74fde44b389ff7a173 Mon Sep 17 00:00:00 2001 From: thankyouverycool <66646555+thankyouverycool@users.noreply.github.com> Date: Thu, 18 Aug 2022 07:02:22 -0400 Subject: [PATCH] WindowServer: Remove m_unmaximized_rect from Window Superceded by m_floating_rect --- Userland/Services/WindowServer/Window.cpp | 8 +++----- Userland/Services/WindowServer/Window.h | 1 - 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Userland/Services/WindowServer/Window.cpp b/Userland/Services/WindowServer/Window.cpp index c914b8315d..b2d14112ed 100644 --- a/Userland/Services/WindowServer/Window.cpp +++ b/Userland/Services/WindowServer/Window.cpp @@ -423,12 +423,10 @@ void Window::set_maximized(bool maximized) return; m_tile_type = maximized ? WindowTileType::Maximized : WindowTileType::None; update_window_menu_items(); - if (maximized) { - m_unmaximized_rect = m_floating_rect; + if (maximized) set_rect(WindowManager::the().tiled_window_rect(*this)); - } else { - set_rect(m_unmaximized_rect); - } + else + set_rect(m_floating_rect); m_frame.did_set_maximized({}, maximized); Core::EventLoop::current().post_event(*this, make(m_rect)); set_default_positioned(false); diff --git a/Userland/Services/WindowServer/Window.h b/Userland/Services/WindowServer/Window.h index 94ab480be0..bc915aa71a 100644 --- a/Userland/Services/WindowServer/Window.h +++ b/Userland/Services/WindowServer/Window.h @@ -455,7 +455,6 @@ private: RefPtr m_cursor_override; WindowFrame m_frame; Gfx::DisjointRectSet m_pending_paint_rects; - Gfx::IntRect m_unmaximized_rect; Gfx::IntRect m_rect_in_applet_area; RefPtr m_window_menu; MenuItem* m_window_menu_minimize_item { nullptr };