From d11ce1d8080ac2ae6097c63804c7a5fd39cb7713 Mon Sep 17 00:00:00 2001 From: thankyouverycool <66646555+thankyouverycool@users.noreply.github.com> Date: Sun, 7 Aug 2022 20:14:01 -0400 Subject: [PATCH] WindowServer: Let WindowManager set serverside effects Menu and Window animations can now be disabled and the geometry overlay made conditional. Shadow options are dependent on the current theme actually supplying bitmaps, but they provide a fast way to toggle those that do without having to edit theme files. --- Userland/Services/WindowServer/Menu.cpp | 2 ++ Userland/Services/WindowServer/Window.cpp | 4 ++++ .../Services/WindowServer/WindowFrame.cpp | 6 ++++++ .../Services/WindowServer/WindowManager.cpp | 21 ++++++++++++------- 4 files changed, 26 insertions(+), 7 deletions(-) diff --git a/Userland/Services/WindowServer/Menu.cpp b/Userland/Services/WindowServer/Menu.cpp index 2bf26ff99be..992d1145555 100644 --- a/Userland/Services/WindowServer/Menu.cpp +++ b/Userland/Services/WindowServer/Menu.cpp @@ -481,6 +481,8 @@ void Menu::clear_hovered_item() void Menu::start_activation_animation(MenuItem& item) { + if (!WindowManager::the().system_effects().animate_menus()) + return; VERIFY(menu_window()); VERIFY(menu_window()->backing_store()); auto window = Window::construct(*this, WindowType::Menu); diff --git a/Userland/Services/WindowServer/Window.cpp b/Userland/Services/WindowServer/Window.cpp index aa499fc886f..5990f364a3e 100644 --- a/Userland/Services/WindowServer/Window.cpp +++ b/Userland/Services/WindowServer/Window.cpp @@ -382,6 +382,8 @@ void Window::start_minimize_animation() { if (&window_stack() != &WindowManager::the().current_window_stack()) return; + if (!WindowManager::the().system_effects().animate_windows()) + return; if (!m_have_taskbar_rect) { // If this is a modal window, it may not have its own taskbar // button, so there is no rectangle. In that case, walk the @@ -427,6 +429,8 @@ void Window::start_launch_animation(Gfx::IntRect const& launch_origin_rect) { if (&window_stack() != &WindowManager::the().current_window_stack()) return; + if (!WindowManager::the().system_effects().animate_windows()) + return; m_animation = Animation::create(); m_animation->set_duration(150); diff --git a/Userland/Services/WindowServer/WindowFrame.cpp b/Userland/Services/WindowServer/WindowFrame.cpp index 3113d4052c4..a3f904d5f4b 100644 --- a/Userland/Services/WindowServer/WindowFrame.cpp +++ b/Userland/Services/WindowServer/WindowFrame.cpp @@ -199,8 +199,12 @@ MultiScaleBitmaps const* WindowFrame::shadow_bitmap() const case WindowType::Desktop: return nullptr; case WindowType::Menu: + if (!WindowManager::the().system_effects().menu_shadow()) + return nullptr; return s_menu_shadow; case WindowType::Tooltip: + if (!WindowManager::the().system_effects().tooltip_shadow()) + return nullptr; return s_tooltip_shadow; case WindowType::Taskbar: return s_taskbar_shadow; @@ -209,6 +213,8 @@ MultiScaleBitmaps const* WindowFrame::shadow_bitmap() const case WindowType::WindowSwitcher: return nullptr; default: + if (!WindowManager::the().system_effects().window_shadow()) + return nullptr; // FIXME: Support shadow for themes with border radius if (WindowManager::the().palette().window_border_radius() > 0) return nullptr; diff --git a/Userland/Services/WindowServer/WindowManager.cpp b/Userland/Services/WindowServer/WindowManager.cpp index 1979df2db58..98f04f05d73 100644 --- a/Userland/Services/WindowServer/WindowManager.cpp +++ b/Userland/Services/WindowServer/WindowManager.cpp @@ -699,8 +699,10 @@ void WindowManager::start_window_move(Window& window, Gfx::IntPoint const& origi m_move_origin = origin; m_move_window_origin = window.position(); m_move_window_cursor_position = window.is_tiled() ? to_floating_cursor_position(m_mouse_down_origin) : m_mouse_down_origin; - m_geometry_overlay = Compositor::the().create_overlay(window); - m_geometry_overlay->set_enabled(true); + if (system_effects().geometry() == ShowGeometry::OnMoveAndResize || system_effects().geometry() == ShowGeometry::OnMoveOnly) { + m_geometry_overlay = Compositor::the().create_overlay(window); + m_geometry_overlay->set_enabled(true); + } window.invalidate(true, true); } @@ -740,8 +742,10 @@ void WindowManager::start_window_resize(Window& window, Gfx::IntPoint const& pos m_resize_window = window; m_resize_origin = position; m_resize_window_original_rect = window.rect(); - m_geometry_overlay = Compositor::the().create_overlay(window); - m_geometry_overlay->set_enabled(true); + if (system_effects().geometry() == ShowGeometry::OnMoveAndResize || system_effects().geometry() == ShowGeometry::OnResizeOnly) { + m_geometry_overlay = Compositor::the().create_overlay(window); + m_geometry_overlay->set_enabled(true); + } current_window_stack().set_active_input_tracking_window(nullptr); @@ -843,8 +847,9 @@ bool WindowManager::process_ongoing_window_move(MouseEvent& event) m_move_window_origin = m_move_window->position(); } } - - m_geometry_overlay->window_rect_changed(); + if (system_effects().geometry() == ShowGeometry::OnMoveAndResize || system_effects().geometry() == ShowGeometry::OnMoveOnly) { + m_geometry_overlay->window_rect_changed(); + } } return true; } @@ -1017,7 +1022,9 @@ bool WindowManager::process_ongoing_window_resize(MouseEvent const& event) dbgln_if(RESIZE_DEBUG, "[WM] Resizing, original: {}, now: {}", m_resize_window_original_rect, new_rect); m_resize_window->set_rect(new_rect); - m_geometry_overlay->window_rect_changed(); + if (system_effects().geometry() == ShowGeometry::OnMoveAndResize || system_effects().geometry() == ShowGeometry::OnResizeOnly) { + m_geometry_overlay->window_rect_changed(); + } Core::EventLoop::current().post_event(*m_resize_window, make(new_rect)); return true; }