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

WindowServer: Make Menus the input window when showing them

Browse source 
This solves a problem where windows don't receive a WindowInputLeft
event when popup menus are opened. This prevented ComboBox being
closed when right clicking the application on the task bar.
This commit is contained in:
Tom 2020-07-15 10:13:13 -06:00 • committed by Andreas Kling
parent 59596ff816
commit 8286e72187
8 changed files with 125 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Services/WindowServer/Menu.cpp
View file

@ -284,12 +284,12 @@ MenuItem* Menu::hovered_item() const
return const_cast<MenuItem*>(&item(m_hovered_item_index));
}
void Menu::update_for_new_hovered_item()
void Menu::update_for_new_hovered_item(bool make_input)
{
if (hovered_item() && hovered_item()->is_submenu()) {
ASSERT(menu_window());
MenuManager::the().close_everyone_not_in_lineage(*hovered_item()->submenu());
hovered_item()->submenu()->popup(hovered_item()->rect().top_right().translated(menu_window()->rect().location()));
hovered_item()->submenu()->do_popup(hovered_item()->rect().top_right().translated(menu_window()->rect().location()), make_input);
} else {
MenuManager::the().close_everyone_not_in_lineage(*this);
ensure_menu_window().set_visible(true);
@ -313,7 +313,7 @@ void Menu::descend_into_submenu_at_hovered_item()
ASSERT(hovered_item());
auto submenu = hovered_item()->submenu();
ASSERT(submenu);
MenuManager::the().open_menu(*submenu);
MenuManager::the().open_menu(*submenu, false);
submenu->set_hovered_item(0);
ASSERT(submenu->hovered_item()->type() != MenuItem::Separator);
}
@ -384,7 +384,7 @@ void Menu::event(Core::Event& event)
// Default to the first item on key press if one has not been selected yet
if (!hovered_item()) {
m_hovered_item_index = 0;
update_for_new_hovered_item();
update_for_new_hovered_item(key == Key_Right);
return;
}
@ -508,6 +508,11 @@ void Menu::redraw_if_theme_changed()
}
void Menu::popup(const Gfx::IntPoint& position)
{
do_popup(position, true);
}
void Menu::do_popup(const Gfx::IntPoint& position, bool make_input)
{
if (is_empty()) {
dbg() << "Menu: Empty menu popup";
@ -532,7 +537,7 @@ void Menu::popup(const Gfx::IntPoint& position)
window.move_to(adjusted_pos);
window.set_visible(true);
MenuManager::the().open_menu(*this, false);
MenuManager::the().open_menu(*this, make_input);
WindowManager::the().did_popup_a_menu({});
}