From 1f1ac99ef9c9a0bef05538d1d915e314d78bade4 Mon Sep 17 00:00:00 2001 From: thankyouverycool <66646555+thankyouverycool@users.noreply.github.com> Date: Mon, 15 Aug 2022 09:20:09 -0400 Subject: [PATCH] WindowServer+WorkspacePicker: Adjust active and inactive colors Now uses the Selection ColorRole for the active desktop and a slightly darkened Window for inactive ones. Several themes use the same color for thread highlighting and inactive windows which was causing frames to draw without the correct perception of depth. --- Userland/Applets/WorkspacePicker/DesktopStatusWindow.cpp | 4 ++-- Userland/Services/WindowServer/Overlays.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Userland/Applets/WorkspacePicker/DesktopStatusWindow.cpp b/Userland/Applets/WorkspacePicker/DesktopStatusWindow.cpp index 97263525e1..d3cacfed4d 100644 --- a/Userland/Applets/WorkspacePicker/DesktopStatusWindow.cpp +++ b/Userland/Applets/WorkspacePicker/DesktopStatusWindow.cpp @@ -47,8 +47,8 @@ public: auto& desktop = GUI::Desktop::the(); - auto active_color = palette().active_window_border1(); - auto inactive_color = palette().inactive_window_border1(); + auto active_color = palette().selection(); + auto inactive_color = palette().window().darkened(0.9f); for (unsigned row = 0; row < desktop.workspace_rows(); ++row) { for (unsigned column = 0; column < desktop.workspace_columns(); ++column) { diff --git a/Userland/Services/WindowServer/Overlays.cpp b/Userland/Services/WindowServer/Overlays.cpp index 582227b64c..1a2ac6291d 100644 --- a/Userland/Services/WindowServer/Overlays.cpp +++ b/Userland/Services/WindowServer/Overlays.cpp @@ -323,8 +323,8 @@ void WindowStackSwitchOverlay::render_overlay_bitmap(Gfx::Painter& painter) { // We should come up with a more elegant way to get the content rectangle auto content_rect = Gfx::IntRect({}, m_content_size).centered_within({ {}, rect().size() }); - auto active_color = WindowManager::the().palette().active_window_border1(); - auto inactive_color = WindowManager::the().palette().inactive_window_border1(); + auto active_color = WindowManager::the().palette().selection(); + auto inactive_color = WindowManager::the().palette().window().darkened(0.9f); for (int y = 0; y < m_rows; y++) { for (int x = 0; x < m_columns; x++) { Gfx::IntRect rect {