RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-24 19:47:42 +00:00
Code Issues Activity Actions

LibGUI: Track window visibility with a separate flag (#1424)

Browse source 
See https://github.com/SerenityOS/serenity/pull/1410 for the motivation.
This commit is contained in:
Alex Muscar 2020-03-12 11:32:28 +00:00 • committed by GitHub
parent 01133733dd
commit 673848f472
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

44
Libraries/LibGUI/Window.cpp
View file

@ -79,7 +79,7 @@ void Window::close()
void Window::move_to_front() void Window::move_to_front()
{ {
if (!m_window_id) if (!is_visible())
return; return;
WindowServerConnection::the().send_sync<Messages::WindowServer::MoveWindowToFront>(m_window_id); WindowServerConnection::the().send_sync<Messages::WindowServer::MoveWindowToFront>(m_window_id);
@ -87,7 +87,7 @@ void Window::move_to_front()
void Window::show() void Window::show()
{ {
if (m_window_id) if (is_visible())
return; return;
auto response = WindowServerConnection::the().send_sync<Messages::WindowServer::CreateWindow>( auto response = WindowServerConnection::the().send_sync<Messages::WindowServer::CreateWindow>(
m_rect_when_windowless, m_rect_when_windowless,
@ -103,6 +103,7 @@ void Window::show()
(i32)m_window_type, (i32)m_window_type,
m_title_when_windowless); m_title_when_windowless);
m_window_id = response->window_id(); m_window_id = response->window_id();
m_visible = true;
apply_icon(); apply_icon();
@ -113,11 +114,12 @@ void Window::show()
void Window::hide() void Window::hide()
{ {
if (!m_window_id) if (!is_visible())
return; return;
reified_windows->remove(m_window_id); reified_windows->remove(m_window_id);
WindowServerConnection::the().send_sync<Messages::WindowServer::DestroyWindow>(m_window_id); WindowServerConnection::the().send_sync<Messages::WindowServer::DestroyWindow>(m_window_id);
m_window_id = 0; m_window_id = 0;
m_visible = false;
m_pending_paint_event_rects.clear(); m_pending_paint_event_rects.clear();
m_back_bitmap = nullptr; m_back_bitmap = nullptr;
m_front_bitmap = nullptr; m_front_bitmap = nullptr;
@ -136,21 +138,21 @@ void Window::hide()
void Window::set_title(const StringView& title) void Window::set_title(const StringView& title)
{ {
m_title_when_windowless = title; m_title_when_windowless = title;
if (!m_window_id) if (!is_visible())
return; return;
WindowServerConnection::the().send_sync<Messages::WindowServer::SetWindowTitle>(m_window_id, title); WindowServerConnection::the().send_sync<Messages::WindowServer::SetWindowTitle>(m_window_id, title);
} }
String Window::title() const String Window::title() const
{ {
if (!m_window_id) if (!is_visible())
return m_title_when_windowless; return m_title_when_windowless;
return WindowServerConnection::the().send_sync<Messages::WindowServer::GetWindowTitle>(m_window_id)->title(); return WindowServerConnection::the().send_sync<Messages::WindowServer::GetWindowTitle>(m_window_id)->title();
} }
Gfx::Rect Window::rect() const Gfx::Rect Window::rect() const
{ {
if (!m_window_id) if (!is_visible())
return m_rect_when_windowless; return m_rect_when_windowless;
return WindowServerConnection::the().send_sync<Messages::WindowServer::GetWindowRect>(m_window_id)->rect(); return WindowServerConnection::the().send_sync<Messages::WindowServer::GetWindowRect>(m_window_id)->rect();
} }
@ -158,7 +160,7 @@ Gfx::Rect Window::rect() const
void Window::set_rect(const Gfx::Rect& a_rect) void Window::set_rect(const Gfx::Rect& a_rect)
{ {
m_rect_when_windowless = a_rect; m_rect_when_windowless = a_rect;
if (!m_window_id) { if (!is_visible()) {
if (m_main_widget) if (m_main_widget)
m_main_widget->resize(m_rect_when_windowless.size()); m_main_widget->resize(m_rect_when_windowless.size());
return; return;
@ -179,7 +181,7 @@ void Window::set_window_type(WindowType window_type)
void Window::set_override_cursor(StandardCursor cursor) void Window::set_override_cursor(StandardCursor cursor)
{ {
if (!m_window_id) if (!is_visible())
return; return;
WindowServerConnection::the().send_sync<Messages::WindowServer::SetWindowOverrideCursor>(m_window_id, (u32)cursor); WindowServerConnection::the().send_sync<Messages::WindowServer::SetWindowOverrideCursor>(m_window_id, (u32)cursor);
} }
@ -228,7 +230,7 @@ void Window::event(Core::Event& event)
} }
if (event.type() == Event::MultiPaint) { if (event.type() == Event::MultiPaint) {
if (!m_window_id) if (!is_visible())
return; return;
if (!m_main_widget) if (!m_main_widget)
return; return;
@ -266,7 +268,7 @@ void Window::event(Core::Event& event)
else if (created_new_backing_store) else if (created_new_backing_store)
set_current_backing_bitmap(*m_back_bitmap, true); set_current_backing_bitmap(*m_back_bitmap, true);
if (m_window_id) { if (is_visible()) {
Vector<Gfx::Rect> rects_to_send; Vector<Gfx::Rect> rects_to_send;
for (auto& r : rects) for (auto& r : rects)
rects_to_send.append(r); rects_to_send.append(r);
@ -337,7 +339,7 @@ void Window::event(Core::Event& event)
bool Window::is_visible() const bool Window::is_visible() const
{ {
return m_window_id != 0; return m_visible;
} }
void Window::update() void Window::update()
@ -348,7 +350,7 @@ void Window::update()
void Window::force_update() void Window::force_update()
{ {
if (!this->is_visible()) if (!is_visible())
return; return;
auto rect = this->rect(); auto rect = this->rect();
WindowServerConnection::the().post_message(Messages::WindowServer::InvalidateRect(m_window_id, { { 0, 0, rect.width(), rect.height() } }, true)); WindowServerConnection::the().post_message(Messages::WindowServer::InvalidateRect(m_window_id, { { 0, 0, rect.width(), rect.height() } }, true));
@ -356,7 +358,7 @@ void Window::force_update()
void Window::update(const Gfx::Rect& a_rect) void Window::update(const Gfx::Rect& a_rect)
{ {
if (!m_window_id) if (!is_visible())
return; return;
for (auto& pending_rect : m_pending_paint_event_rects) { for (auto& pending_rect : m_pending_paint_event_rects) {
@ -439,7 +441,7 @@ void Window::set_has_alpha_channel(bool value)
if (m_has_alpha_channel == value) if (m_has_alpha_channel == value)
return; return;
m_has_alpha_channel = value; m_has_alpha_channel = value;
if (!m_window_id) if (!is_visible())
return; return;
m_pending_paint_event_rects.clear(); m_pending_paint_event_rects.clear();
@ -452,14 +454,14 @@ void Window::set_has_alpha_channel(bool value)
void Window::set_double_buffering_enabled(bool value) void Window::set_double_buffering_enabled(bool value)
{ {
ASSERT(!m_window_id); ASSERT(!is_visible());
m_double_buffering_enabled = value; m_double_buffering_enabled = value;
} }
void Window::set_opacity(float opacity) void Window::set_opacity(float opacity)
{ {
m_opacity_when_windowless = opacity; m_opacity_when_windowless = opacity;
if (!m_window_id) if (!is_visible())
return; return;
WindowServerConnection::the().send_sync<Messages::WindowServer::SetWindowOpacity>(m_window_id, opacity); WindowServerConnection::the().send_sync<Messages::WindowServer::SetWindowOpacity>(m_window_id, opacity);
} }
@ -524,7 +526,7 @@ NonnullRefPtr<Gfx::Bitmap> Window::create_backing_bitmap(const Gfx::Size& size)
void Window::set_modal(bool modal) void Window::set_modal(bool modal)
{ {
ASSERT(!m_window_id); ASSERT(!is_visible());
m_modal = modal; m_modal = modal;
} }
@ -551,7 +553,7 @@ void Window::apply_icon()
if (!m_icon) if (!m_icon)
return; return;
if (!m_window_id) if (!is_visible())
return; return;
int rc = shbuf_seal(m_icon->shbuf_id()); int rc = shbuf_seal(m_icon->shbuf_id());
@ -615,7 +617,7 @@ void Window::set_fullscreen(bool fullscreen)
if (m_fullscreen == fullscreen) if (m_fullscreen == fullscreen)
return; return;
m_fullscreen = fullscreen; m_fullscreen = fullscreen;
if (!m_window_id) if (!is_visible())
return; return;
WindowServerConnection::the().send_sync<Messages::WindowServer::SetFullscreen>(m_window_id, fullscreen); WindowServerConnection::the().send_sync<Messages::WindowServer::SetFullscreen>(m_window_id, fullscreen);
} }
@ -678,7 +680,7 @@ void Window::set_base_size(const Gfx::Size& base_size)
if (m_base_size == base_size) if (m_base_size == base_size)
return; return;
m_base_size = base_size; m_base_size = base_size;
if (m_window_id) if (is_visible())
WindowServerConnection::the().send_sync<Messages::WindowServer::SetWindowBaseSizeAndSizeIncrement>(m_window_id, m_base_size, m_size_increment); WindowServerConnection::the().send_sync<Messages::WindowServer::SetWindowBaseSizeAndSizeIncrement>(m_window_id, m_base_size, m_size_increment);
} }
@ -687,7 +689,7 @@ void Window::set_size_increment(const Gfx::Size& size_increment)
if (m_size_increment == size_increment) if (m_size_increment == size_increment)
return; return;
m_size_increment = size_increment; m_size_increment = size_increment;
if (m_window_id) if (is_visible())
WindowServerConnection::the().send_sync<Messages::WindowServer::SetWindowBaseSizeAndSizeIncrement>(m_window_id, m_base_size, m_size_increment); WindowServerConnection::the().send_sync<Messages::WindowServer::SetWindowBaseSizeAndSizeIncrement>(m_window_id, m_base_size, m_size_increment);
} }

1
Libraries/LibGUI/Window.h
View file

@ -221,6 +221,7 @@ private:
bool m_show_titlebar { true }; bool m_show_titlebar { true };
bool m_layout_pending { false }; bool m_layout_pending { false };
bool m_visible_for_timer_purposes { true }; bool m_visible_for_timer_purposes { true };
bool m_visible { false };
}; };
} }