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

Taskbar: Don't create buttons for modal windows

Browse source 
Since the user can't really do much with windows that are blocked
by a modal window, there is no point in showing multiple buttons.
This commit is contained in:
Tom 2020-07-15 17:44:42 -06:00 • committed by Andreas Kling
parent bbdf0665fc
commit a269e3e573
5 changed files with 114 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

90
Services/Taskbar/TaskbarWindow.cpp
View file

@ -35,6 +35,7 @@
#include <LibGUI/Frame.h>
#include <LibGUI/Painter.h>
#include <LibGUI/Window.h>
#include <LibGUI/WindowServerConnection.h>
#include <LibGfx/Palette.h>
#include <stdio.h>
@ -74,10 +75,6 @@ TaskbarWindow::TaskbarWindow()
m_default_icon = Gfx::Bitmap::load_from_file("/res/icons/16x16/window.png");
WindowList::the().aid_create_button = [this](auto& identifier) {
return create_button(identifier);
};
create_quick_launch_bar();
}
@ -161,6 +158,67 @@ static bool should_include_window(GUI::WindowType window_type, bool is_frameless
return window_type == GUI::WindowType::Normal && !is_frameless;
}
void TaskbarWindow::add_window_button(::Window& window, const WindowIdentifier& identifier)
{
if (window.button())
return;
window.set_button(create_button(identifier));
auto* button = window.button();
button->on_click = [window = &window, identifier, button](auto) {
// We need to look at the button's checked state here to figure
// out if the application is active or not. That's because this
// button's window may not actually be active when a modal window
// is displayed, in which case window->is_active() would return
// false because window is the modal window's owner (which is not
// active)
if (window->is_minimized() || !button->is_checked()) {
GUI::WindowServerConnection::the().post_message(Messages::WindowServer::WM_SetActiveWindow(identifier.client_id(), identifier.window_id()));
} else {
GUI::WindowServerConnection::the().post_message(Messages::WindowServer::WM_SetWindowMinimized(identifier.client_id(), identifier.window_id(), true));
}
};
}
void TaskbarWindow::remove_window_button(::Window& window)
{
auto* button = window.button();
if (!button)
return;
window.set_button(nullptr);
button->remove_from_parent();
}
void TaskbarWindow::update_window_button(::Window& window, bool show_as_active)
{
auto* button = window.button();
if (!button)
return;
if (window.is_minimized()) {
button->set_foreground_color(Color::DarkGray);
} else {
button->set_foreground_color(Color::Black);
}
button->set_text(window.title());
button->set_checked(show_as_active);
}
::Window* TaskbarWindow::find_window_owner(::Window& window) const
{
if (!window.is_modal())
return &window;
::Window* parent = nullptr;
auto* current_window = &window;
while (current_window) {
parent = WindowList::the().find_parent(*current_window);
if (!parent || !parent->is_modal())
break;
current_window = parent;
}
return parent;
}
void TaskbarWindow::wm_event(GUI::WMEvent& event)
{
WindowIdentifier identifier { event.client_id(), event.window_id() };
@ -198,7 +256,8 @@ void TaskbarWindow::wm_event(GUI::WMEvent& event)
if (auto* window = WindowList::the().window(identifier)) {
auto buffer = SharedBuffer::create_from_shbuf_id(changed_event.icon_buffer_id());
ASSERT(buffer);
window->button()->set_icon(Gfx::Bitmap::create_with_shared_buffer(Gfx::BitmapFormat::RGBA32, *buffer, changed_event.icon_size()));
if (window->button())
window->button()->set_icon(Gfx::Bitmap::create_with_shared_buffer(Gfx::BitmapFormat::RGBA32, *buffer, changed_event.icon_size()));
}
break;
}
@ -217,18 +276,27 @@ void TaskbarWindow::wm_event(GUI::WMEvent& event)
if (!should_include_window(changed_event.window_type(), changed_event.is_frameless()))
break;
auto& window = WindowList::the().ensure_window(identifier);
window.set_parent_identifier({ changed_event.parent_client_id(), changed_event.parent_window_id() });
if (!window.is_modal())
add_window_button(window, identifier);
else
remove_window_button(window);
window.set_title(changed_event.title());
window.set_rect(changed_event.rect());
window.set_modal(changed_event.is_modal());
window.set_active(changed_event.is_active());
window.set_minimized(changed_event.is_minimized());
window.set_progress(changed_event.progress());
if (window.is_minimized()) {
window.button()->set_foreground_color(Color::DarkGray);
} else {
window.button()->set_foreground_color(Color::Black);
auto* window_owner = find_window_owner(window);
if (window_owner == &window) {
update_window_button(window, window.is_active());
} else if (window_owner) {
// check the window owner's button if the modal's window button
// would have been checked
ASSERT(window.is_modal());
update_window_button(*window_owner, window.is_active());
}
window.button()->set_text(changed_event.title());
window.button()->set_checked(changed_event.is_active());
break;
}
default: