asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #65117 from YeldhamDev/menubar_key_fix

Browse source 
Fix switching `MenuBar`'s menus with the keys while mouse hovering
This commit is contained in:
Rémi Verschelde 2022-09-01 08:46:01 +02:00 committed by GitHub
commit 0a34994720
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
scene/gui/menu_bar.cpp
View file

@ -377,6 +377,11 @@ void MenuBar::_notification(int p_what) {
MutexLock lock(mutex);
Vector2 pos = DisplayServer::get_singleton()->mouse_get_position() - mouse_pos_adjusted - get_global_position();
if (pos == old_mouse_pos) {
return;
}
old_mouse_pos = pos;
int index = _get_index_at_point(pos);
if (index >= 0 && index != active_menu) {
selected_menu = index;

1
scene/gui/menu_bar.h
View file

@ -73,6 +73,7 @@ class MenuBar : public Control {
int active_menu = -1;
Vector2i mouse_pos_adjusted;
Vector2i old_mouse_pos;
ObjectID shortcut_context;
int _get_index_at_point(const Point2 &p_point) const;