RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 13:48:12 +00:00
Code Issues Activity Actions

LibGUI+WindowServer: Initialize minimum window size to zero

Browse source 
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.
This commit is contained in:
thankyouverycool 2022-08-17 19:08:18 -04:00 • committed by Andreas Kling
parent 8b8cee3172
commit 46d6347035
5 changed files with 14 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Userland/Libraries/LibGUI/Window.cpp
View file

@ -70,7 +70,7 @@ Window::Window(Core::Object* parent)
, m_menubar(Menubar::construct())
{
all_windows->set(this);
m_rect_when_windowless = { -5000, -5000, 140, 140 };
m_rect_when_windowless = { -5000, -5000, 0, 0 };
m_title_when_windowless = "GUI::Window";
register_property(
@ -289,7 +289,8 @@ Gfx::IntSize Window::minimum_size() const
void Window::set_minimum_size(Gfx::IntSize const& size)
{
m_minimum_size_modified = true;
VERIFY(size.width() >= 0 && size.height() >= 0);
VERIFY(!is_obeying_widget_min_size());
m_minimum_size_when_windowless = size;
if (is_visible())
@ -311,14 +312,6 @@ void Window::center_within(Window const& other)
void Window::set_window_type(WindowType window_type)
{
m_window_type = window_type;
if (!m_minimum_size_modified) {
// Apply minimum size defaults.
if (m_window_type == WindowType::Normal || m_window_type == WindowType::ToolWindow)
m_minimum_size_when_windowless = { 50, 50 };
else
m_minimum_size_when_windowless = { 1, 1 };
}
}
void Window::make_window_manager(unsigned event_mask)
@ -1044,7 +1037,10 @@ void Window::update_min_size()
main_widget()->do_layout();
if (m_obey_widget_min_size) {
auto min_size = main_widget()->effective_min_size();
set_minimum_size(MUST(min_size.width().shrink_value()), MUST(min_size.height().shrink_value()));
Gfx::IntSize size = { MUST(min_size.width().shrink_value()), MUST(min_size.height().shrink_value()) };
m_minimum_size_when_windowless = size;
if (is_visible())
ConnectionToWindowServer::the().async_set_window_minimum_size(m_window_id, size);
}
}
}