Gremlinsoft
/
godot
forked from sascha/godot
2
0
Fork 0
Code Pull Requests Activity

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

Fix `MenuBar` and `MenuButton` hover position scaling properly with the scale factor multiplier
master
Rémi Verschelde 2024-01-26 11:42:59 +07:00
parent 849b69828b e864b26e54
commit 23275074cb
No known key found for this signature in database
GPG Key ID: C3336907360768E1
4 changed files with 4 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
scene/gui/menu_bar.cpp
Unescape Escape 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;
}

1
scene/gui/menu_bar.h
Unescape Escape View File

@ -71,7 +71,6 @@ class MenuBar : public Control {
int selected_menu = -1;
int active_menu = -1;
Vector2i mouse_pos_adjusted;
Vector2i old_mouse_pos;
ObjectID shortcut_context;

22
scene/gui/menu_button.cpp
Unescape Escape View File

@ -57,24 +57,7 @@ void MenuButton::_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);
}
}
@ -155,8 +138,7 @@ void MenuButton::_notification(int p_what) {
} break;
case NOTIFICATION_INTERNAL_PROCESS: {
Vector2i mouse_pos = DisplayServer::get_singleton()->mouse_get_position() - mouse_pos_adjusted;
MenuButton *menu_btn_other = Object::cast_to<MenuButton>(get_viewport()->gui_find_control(mouse_pos));
MenuButton *menu_btn_other = Object::cast_to<MenuButton>(get_viewport()->gui_find_control(get_viewport()->get_mouse_position()));
if (menu_btn_other && menu_btn_other != this && menu_btn_other->is_switch_on_hover() && !menu_btn_other->is_disabled() &&
(get_parent()->is_ancestor_of(menu_btn_other) || menu_btn_other->get_parent()->is_ancestor_of(popup))) {

2
scene/gui/menu_button.h
Unescape Escape View File

@ -42,8 +42,6 @@ class MenuButton : public Button {
bool disable_shortcuts = false;
PopupMenu *popup = nullptr;
Vector2i mouse_pos_adjusted;
void _popup_visibility_changed(bool p_visible);
protected: