diff options
author | thankyouverycool <66646555+thankyouverycool@users.noreply.github.com> | 2022-08-17 19:08:18 -0400 |
---|---|---|
committer | Andreas Kling <kling@serenityos.org> | 2022-08-25 13:28:50 +0200 |
commit | 46d6347035357fb6ec49e21326e358e2e54557c8 (patch) | |
tree | 5544bab7a7bd9cb67907ba32d91387fa384d2699 /Userland/Services | |
parent | 8b8cee31728b02a500ee530e081c7b767ebb68cd (diff) | |
download | serenity-46d6347035357fb6ec49e21326e358e2e54557c8.zip |
LibGUI+WindowServer: Initialize minimum window size to zero
And remove unnecessary workarounds to the old limit of {50, 50} and
the cautious but arbitrary limit of {1, 1} for other WindowTypes.
Null rects are already the default when calculating minimum window
size and are the least restrictive but valid value.
Also returns early during minimum size calculations for frameless
windows, and verifies against negative minimum sizes and failure to
disable widget min size before setting a minimum window size. Layout
automatically overrides this setting each relayout otherwise.
Diffstat (limited to 'Userland/Services')
-rw-r--r-- | Userland/Services/WindowServer/ConnectionFromClient.cpp | 3 | ||||
-rw-r--r-- | Userland/Services/WindowServer/Window.cpp | 21 | ||||
-rw-r--r-- | Userland/Services/WindowServer/Window.h | 2 |
3 files changed, 6 insertions, 20 deletions
diff --git a/Userland/Services/WindowServer/ConnectionFromClient.cpp b/Userland/Services/WindowServer/ConnectionFromClient.cpp index 4a451e9fb3..13aed5f3de 100644 --- a/Userland/Services/WindowServer/ConnectionFromClient.cpp +++ b/Userland/Services/WindowServer/ConnectionFromClient.cpp @@ -470,6 +470,9 @@ Messages::WindowServer::GetWindowRectResponse ConnectionFromClient::get_window_r static Gfx::IntSize calculate_minimum_size_for_window(Window const& window) { + if (window.is_frameless()) + return { 0, 0 }; + // NOTE: Windows with a title bar have a minimum size enforced by the system, // because we want to always keep their title buttons accessible. if (window.type() == WindowType::Normal || window.type() == WindowType::ToolWindow) { diff --git a/Userland/Services/WindowServer/Window.cpp b/Userland/Services/WindowServer/Window.cpp index 5990f364a3..cabcfdface 100644 --- a/Userland/Services/WindowServer/Window.cpp +++ b/Userland/Services/WindowServer/Window.cpp @@ -19,8 +19,6 @@ namespace WindowServer { -static constexpr Gfx::IntSize s_default_normal_minimum_size = { 50, 50 }; - static String default_window_icon_path() { return "/res/icons/16x16/window.png"; @@ -88,10 +86,6 @@ Window::Window(Core::Object& parent, WindowType type) , m_icon(default_window_icon()) , m_frame(*this) { - // Set default minimum size for Normal windows - if (m_type == WindowType::Normal) - m_minimum_size = s_default_normal_minimum_size; - WindowManager::the().add_window(*this); frame().window_was_constructed({}); } @@ -112,10 +106,6 @@ Window::Window(ConnectionFromClient& client, WindowType window_type, int window_ , m_icon(default_window_icon()) , m_frame(*this) { - // Set default minimum size for Normal windows - if (m_type == WindowType::Normal) - m_minimum_size = s_default_normal_minimum_size; - if (parent_window) set_parent_window(*parent_window); WindowManager::the().add_window(*this); @@ -169,7 +159,7 @@ void Window::set_rect(Gfx::IntRect const& rect) void Window::set_rect_without_repaint(Gfx::IntRect const& rect) { - VERIFY(!rect.is_empty()); + VERIFY(rect.width() >= 0 && rect.height() >= 0); if (m_rect == rect) return; auto old_rect = m_rect; @@ -248,16 +238,9 @@ void Window::nudge_into_desktop(Screen* target_screen, bool force_titlebar_visib void Window::set_minimum_size(Gfx::IntSize const& size) { - if (size.is_null()) - return; - + VERIFY(size.width() >= 0 && size.height() >= 0); if (m_minimum_size == size) return; - - // Disallow setting minimum zero widths or heights. - if (size.width() == 0 || size.height() == 0) - return; - m_minimum_size = size; } diff --git a/Userland/Services/WindowServer/Window.h b/Userland/Services/WindowServer/Window.h index 79ec348edc..d6a5e44748 100644 --- a/Userland/Services/WindowServer/Window.h +++ b/Userland/Services/WindowServer/Window.h @@ -450,7 +450,7 @@ private: float m_alpha_hit_threshold { 0.0f }; Gfx::IntSize m_size_increment; Gfx::IntSize m_base_size; - Gfx::IntSize m_minimum_size { 1, 1 }; + Gfx::IntSize m_minimum_size { 0, 0 }; NonnullRefPtr<Gfx::Bitmap> m_icon; RefPtr<Cursor> m_cursor; RefPtr<Cursor> m_cursor_override; |