godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-03 18:11:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #86304 from OverloadedOrama/fix-menubar-scaling

Browse Source 
Fix `MenuBar` and `MenuButton` hover position scaling properly with the scale factor multiplier
This commit is contained in:
Rémi Verschelde
2024-01-26 11:42:59 +01:00
parent 849b69828b e864b26e54
commit 23275074cb
4 changed files with 4 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
scene/gui/menu_bar.cpp
View File

@@ -181,24 +181,7 @@ void MenuBar::_popup_visibility_changed(bool p_visible) {
}
if (switch_on_hover) {
Window *wnd = Object::cast_to<Window>(get_viewport());
if (wnd) {
mouse_pos_adjusted = wnd->get_position();
if (wnd->is_embedded()) {
Window *wnd_parent = Object::cast_to<Window>(wnd->get_parent()->get_viewport());
while (wnd_parent) {
if (!wnd_parent->is_embedded()) {
mouse_pos_adjusted += wnd_parent->get_position();
break;
}
wnd_parent = Object::cast_to<Window>(wnd_parent->get_parent()->get_viewport());
}
}
set_process_internal(true);
}
set_process_internal(true);
}
}
@@ -338,8 +321,7 @@ void MenuBar::_notification(int p_what) {
// Handled by OS.
return;
}
Vector2 pos = DisplayServer::get_singleton()->mouse_get_position() - mouse_pos_adjusted - get_global_position();
Vector2 pos = get_local_mouse_position();
if (pos == old_mouse_pos) {
return;
}