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

WindowServer: Don't keep menu items in hovered state after the cursor leaves.

Browse source
This commit is contained in:
Andreas Kling 2019-02-11 11:06:41 +01:00
parent 6dd1a1f26d
commit e6de6c4f45
3 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
WindowServer/WSMenu.cpp
View file

@ -114,12 +114,19 @@ void WSMenu::on_window_message(WSMessage& message)
if (!m_hovered_item) if (!m_hovered_item)
return; return;
did_activate(*m_hovered_item); did_activate(*m_hovered_item);
m_hovered_item = nullptr; clear_hovered_item();
redraw();
return; return;
} }
} }
void WSMenu::clear_hovered_item()
{
if (!m_hovered_item)
return;
m_hovered_item = nullptr;
redraw();
}
void WSMenu::did_activate(WSMenuItem& item) void WSMenu::did_activate(WSMenuItem& item)
{ {
if (on_item_activation) if (on_item_activation)

3
WindowServer/WSMenu.h
View file

@ -57,6 +57,9 @@ public:
WSMenuItem* item_at(const Point&); WSMenuItem* item_at(const Point&);
void redraw(); void redraw();
const WSMenuItem* hovered_item() const { return m_hovered_item; }
void clear_hovered_item();
Function<void(WSMenuItem&)> on_item_activation; Function<void(WSMenuItem&)> on_item_activation;
private: private:

4
WindowServer/WSWindowManager.cpp
View file

@ -485,6 +485,10 @@ void WSWindowManager::process_mouse_event(WSMouseEvent& event)
return; return;
} }
if (m_current_menu && m_current_menu->hovered_item() && !m_current_menu->menu_window()->rect().contains(event.position())) {
m_current_menu->clear_hovered_item();
}
// FIXME: Figure out an automatic menu dismissal logic that feels right. // FIXME: Figure out an automatic menu dismissal logic that feels right.
#if 0 #if 0
if (m_current_menu && event.type() == WSMouseEvent::MouseUp && event.button() == MouseButton::Left) if (m_current_menu && event.type() == WSMouseEvent::MouseUp && event.button() == MouseButton::Left)