diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2024-03-14 22:34:42 +0100 |
---|---|---|
committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-03-14 22:34:42 +0100 |
commit | 4ca6cd054f303cfec4da21d51fc25e13a43f3e98 (patch) | |
tree | 5f5badc43cdb29fc9599dd675e8b6165dee697f4 /scene/gui/menu_bar.cpp | |
parent | 453485aede521b3c6d2d960bad94acc2eb90f177 (diff) | |
parent | ac7583e4498598281e4372d69d7aab10d90aeacb (diff) | |
download | redot-engine-4ca6cd054f303cfec4da21d51fc25e13a43f3e98.tar.gz |
Merge pull request #89273 from bruvzg/win_native_menu
[NativeMenu] Implement native popup menu support on Windows.
Diffstat (limited to 'scene/gui/menu_bar.cpp')
-rw-r--r-- | scene/gui/menu_bar.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scene/gui/menu_bar.cpp b/scene/gui/menu_bar.cpp index a808a3b1b5..8eb455d0ac 100644 --- a/scene/gui/menu_bar.cpp +++ b/scene/gui/menu_bar.cpp @@ -192,7 +192,7 @@ bool MenuBar::is_native_menu() const { } #endif - return (NativeMenu::get_singleton()->has_feature(NativeMenu::FEATURE_GLOBAL_MENU) && is_native); + return (NativeMenu::get_singleton()->has_feature(NativeMenu::FEATURE_GLOBAL_MENU) && prefer_native); } void MenuBar::bind_global_menu() { @@ -767,9 +767,9 @@ int MenuBar::get_start_index() const { } void MenuBar::set_prefer_global_menu(bool p_enabled) { - if (is_native != p_enabled) { - is_native = p_enabled; - if (is_native) { + if (prefer_native != p_enabled) { + prefer_native = p_enabled; + if (prefer_native) { bind_global_menu(); } else { unbind_global_menu(); @@ -778,7 +778,7 @@ void MenuBar::set_prefer_global_menu(bool p_enabled) { } bool MenuBar::is_prefer_global_menu() const { - return is_native; + return prefer_native; } Size2 MenuBar::get_minimum_size() const { |