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

WindowServer: Rename reevaluate_hovered_window()

Browse source 
...to reevaluate_hover_state_for_window(). This name is not super great
either, but at least it doesn't sound like the window is necessarily
currently being hovered.
This commit is contained in:
Andreas Kling 2021-11-04 14:29:46 +01:00
parent c001926752
commit dd8a459a1f
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Services/WindowServer/ClientConnection.cpp
View file

@ -616,7 +616,7 @@ void ClientConnection::did_finish_painting(i32 window_id, Vector<Gfx::IntRect> c
for (auto& rect : rects) for (auto& rect : rects)
window.invalidate(rect); window.invalidate(rect);
if (window.has_alpha_channel() && window.alpha_hit_threshold() > 0.0f) if (window.has_alpha_channel() && window.alpha_hit_threshold() > 0.0f)
WindowManager::the().reevaluate_hovered_window(&window); WindowManager::the().reevaluate_hover_state_for_window(&window);
WindowSwitcher::the().refresh_if_needed(); WindowSwitcher::the().refresh_if_needed();
} }

8
Userland/Services/WindowServer/WindowManager.cpp
View file

@ -588,7 +588,7 @@ void WindowManager::notify_rect_changed(Window& window, Gfx::IntRect const& old_
if (window.type() == WindowType::Applet) if (window.type() == WindowType::Applet)
AppletManager::the().relayout(); AppletManager::the().relayout();
reevaluate_hovered_window(&window); reevaluate_hover_state_for_window(&window);
} }
void WindowManager::notify_opacity_changed(Window&) void WindowManager::notify_opacity_changed(Window&)
@ -1284,7 +1284,7 @@ void WindowManager::process_mouse_event(MouseEvent& event)
process_mouse_event_for_window(result.value(), event); process_mouse_event_for_window(result.value(), event);
} }
void WindowManager::reevaluate_hovered_window(Window* updated_window) void WindowManager::reevaluate_hover_state_for_window(Window* updated_window)
{ {
if (m_dnd_client || m_resize_window || m_move_window || m_cursor_tracking_button || MenuManager::the().has_open_menu()) if (m_dnd_client || m_resize_window || m_move_window || m_cursor_tracking_button || MenuManager::the().has_open_menu())
return; return;
@ -1492,7 +1492,7 @@ void WindowManager::did_switch_window_stack(Badge<Compositor>, WindowStack& prev
if (!new_stack_active_input_window) if (!new_stack_active_input_window)
pick_new_active_window(nullptr); pick_new_active_window(nullptr);
reevaluate_hovered_window(); reevaluate_hover_state_for_window();
tell_wms_current_window_stack_changed(); tell_wms_current_window_stack_changed();
} }
@ -1766,7 +1766,7 @@ void WindowManager::set_active_window(Window* new_active_window, bool make_input
if (new_active_window) { if (new_active_window) {
window_stack.set_active_window(new_active_window); window_stack.set_active_window(new_active_window);
notify_new_active_window(*new_active_window); notify_new_active_window(*new_active_window);
reevaluate_hovered_window(new_active_window); reevaluate_hover_state_for_window(new_active_window);
} }
// Window shapes may have changed (e.g. shadows for inactive/active windows) // Window shapes may have changed (e.g. shadows for inactive/active windows)

2
Userland/Services/WindowServer/WindowManager.h
View file

@ -261,7 +261,7 @@ public:
void reload_icon_bitmaps_after_scale_change(); void reload_icon_bitmaps_after_scale_change();
void reevaluate_hovered_window(Window* = nullptr); void reevaluate_hover_state_for_window(Window* = nullptr);
Window* hovered_window() const { return m_hovered_window.ptr(); } Window* hovered_window() const { return m_hovered_window.ptr(); }
void switch_to_window_stack(WindowStack&, Window* = nullptr, bool show_overlay = true); void switch_to_window_stack(WindowStack&, Window* = nullptr, bool show_overlay = true);