From ec6debb46f43540eadcc681454ad05fb26926562 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Sat, 17 Apr 2021 18:50:10 +0200 Subject: [PATCH] WindowServer: Don't "enter" menu item when hovering over a separator Since menu separator items don't have an associated identifier, make sure we don't falsely report that we've enter item 0. This fixes an issue where hovering over a separator would behave as if we'd hovered over the first item in the menu wrt sending MenuItemEntered. --- Userland/Services/WindowServer/Menu.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Userland/Services/WindowServer/Menu.cpp b/Userland/Services/WindowServer/Menu.cpp index fe5d3d794d..8f9dbc7ff6 100644 --- a/Userland/Services/WindowServer/Menu.cpp +++ b/Userland/Services/WindowServer/Menu.cpp @@ -556,8 +556,11 @@ int Menu::item_index_at(const Gfx::IntPoint& position) { int i = 0; for (auto& item : m_items) { - if (item.rect().contains(position)) + if (item.rect().contains(position)) { + if (item.type() == MenuItem::Type::Separator) + return -1; return i; + } ++i; } return -1;