Merge pull request #96208 from m4gr3d/cleanup_immersive_logic

Restore fullscreen toggle menu for the Android editor and clean up the immersive mode logic
This commit is contained in:
Rémi Verschelde 2024-08-30 09:59:27 +02:00
commit b128e71383
No known key found for this signature in database
GPG key ID: C3336907360768E1
9 changed files with 128 additions and 57 deletions

View file

@ -7367,11 +7367,9 @@ EditorNode::EditorNode() {
settings_menu->set_item_tooltip(-1, TTR("Screenshots are stored in the user data folder (\"user://\")."));
#ifndef ANDROID_ENABLED
ED_SHORTCUT_AND_COMMAND("editor/fullscreen_mode", TTR("Toggle Fullscreen"), KeyModifierMask::SHIFT | Key::F11);
ED_SHORTCUT_OVERRIDE("editor/fullscreen_mode", "macos", KeyModifierMask::META | KeyModifierMask::CTRL | Key::F);
settings_menu->add_shortcut(ED_GET_SHORTCUT("editor/fullscreen_mode"), SETTINGS_TOGGLE_FULLSCREEN);
#endif
settings_menu->add_separator();
#ifndef ANDROID_ENABLED