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

WindowServer: Add special treatment for modal windows.

Browse source 
While a WSClientConnection has a modal window showing, non-modal windows
belonging to that client are not sent any events.
This commit is contained in:
Andreas Kling 2019-03-19 00:52:39 +01:00
parent 57ff293a51
commit 43304d2adf
13 changed files with 89 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

19
WindowServer/WSWindow.cpp
View file

@ -21,9 +21,10 @@ WSWindow::WSWindow(WSMessageReceiver& internal_owner, WSWindowType type)
WSWindowManager::the().add_window(*this);
}
WSWindow::WSWindow(WSClientConnection& client, int window_id)
WSWindow::WSWindow(WSClientConnection& client, int window_id, bool modal)
: m_client(&client)
, m_type(WSWindowType::Normal)
, m_modal(modal)
, m_window_id(window_id)
, m_icon(default_window_icon())
{
@ -73,6 +74,9 @@ void WSWindow::on_message(WSMessage& message)
if (m_internal_owner)
return m_internal_owner->on_message(message);
if (is_blocked_by_modal_window())
return;
WSAPI_ServerMessage server_message;
server_message.window_id = window_id();
@ -137,7 +141,6 @@ void WSWindow::on_message(WSMessage& message)
if (server_message.type == WSAPI_ServerMessage::Type::Invalid)
return;
ASSERT(m_client);
m_client->post_message(server_message);
}
@ -154,6 +157,13 @@ void WSWindow::set_visible(bool b)
invalidate();
}
void WSWindow::set_resizable(bool resizable)
{
if (m_resizable == resizable)
return;
m_resizable = resizable;
}
void WSWindow::invalidate()
{
WSWindowManager::the().invalidate(*this);
@ -163,3 +173,8 @@ bool WSWindow::is_active() const
{
return WSWindowManager::the().active_window() == this;
}
bool WSWindow::is_blocked_by_modal_window() const
{
return !is_modal() && client() && client()->is_showing_modal_window();
}