mirror/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-02-05 21:41:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

[Editor] Add editor setting to globally override project game mode settings.

Browse Source
This commit is contained in:
bruvzg 2025-01-08 12:17:35 +02:00 committed by Pāvels Nadtočajevs
parent f1c0b5b854
commit 8ddd4985ea
3 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/classes/EditorSettings.xml
View File

@ -1136,6 +1136,9 @@
- [b]Launch in PiP mode[/b] will launch the Play window directly in picture-in-picture (PiP) mode if PiP mode is supported and enabled. When maximized, the Play window will occupy the same window as the Editor.
[b]Note:[/b] Only available in the Android editor.
</member>
<member name="run/window_placement/game_embed_mode" type="int" setter="" getter="">
Overrides game embedding setting for all newly opened projects. If enabled, game embedding settings are not saved.
</member>
<member name="run/window_placement/play_window_pip_mode" type="int" setter="" getter="">
Specifies the picture-in-picture (PiP) mode for the Play window.
- [b]Disabled:[/b] PiP is disabled for the Play window.

2
editor/editor_settings.cpp
View File

@ -940,6 +940,8 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
String android_window_hints = "Auto (based on screen size):0,Same as Editor:1,Side-by-side with Editor:2,Launch in PiP mode:3";
EDITOR_SETTING_BASIC(Variant::INT, PROPERTY_HINT_ENUM, "run/window_placement/android_window", 0, android_window_hints)
EDITOR_SETTING_BASIC(Variant::INT, PROPERTY_HINT_ENUM, "run/window_placement/game_embed_mode", 0, "Use Per-Project Configuration:0,Embed Game:1,Make Game Workspace Floating:2,Disabled:3");
int default_play_window_pip_mode = 0;
#ifdef ANDROID_ENABLED
default_play_window_pip_mode = 2;

32
editor/plugins/game_view_plugin.cpp
View File

@ -401,11 +401,17 @@ void GameView::_embed_options_menu_menu_id_pressed(int p_id) {
switch (p_id) {
case EMBED_RUN_GAME_EMBEDDED: {
embed_on_play = !embed_on_play;
EditorSettings::get_singleton()->set_project_metadata("game_view", "embed_on_play", embed_on_play);
int game_mode = EDITOR_GET("run/window_placement/game_embed_mode");
if (game_mode == 0) { // Save only if not overridden by editor.
EditorSettings::get_singleton()->set_project_metadata("game_view", "embed_on_play", embed_on_play);
}
} break;
case EMBED_MAKE_FLOATING_ON_PLAY: {
make_floating_on_play = !make_floating_on_play;
EditorSettings::get_singleton()->set_project_metadata("game_view", "make_floating_on_play", make_floating_on_play);
int game_mode = EDITOR_GET("run/window_placement/game_embed_mode");
if (game_mode == 0) { // Save only if not overridden by editor.
EditorSettings::get_singleton()->set_project_metadata("game_view", "make_floating_on_play", make_floating_on_play);
}
} break;
}
_update_embed_menu_options();
@ -585,9 +591,27 @@ void GameView::_notification(int p_what) {
case NOTIFICATION_READY: {
if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_WINDOW_EMBEDDING)) {
// Embedding available.
embed_on_play = EditorSettings::get_singleton()->get_project_metadata("game_view", "embed_on_play", true);
make_floating_on_play = EditorSettings::get_singleton()->get_project_metadata("game_view", "make_floating_on_play", true);
int game_mode = EDITOR_GET("run/window_placement/game_embed_mode");
switch (game_mode) {
case 1: { // Embed.
embed_on_play = true;
make_floating_on_play = false;
} break;
case 2: { // Floating.
embed_on_play = true;
make_floating_on_play = true;
} break;
case 3: { // Disabled.
embed_on_play = false;
make_floating_on_play = false;
} break;
default: {
embed_on_play = EditorSettings::get_singleton()->get_project_metadata("game_view", "embed_on_play", true);
make_floating_on_play = EditorSettings::get_singleton()->get_project_metadata("game_view", "make_floating_on_play", true);
} break;
}
embed_size_mode = (EmbedSizeMode)(int)EditorSettings::get_singleton()->get_project_metadata("game_view", "embed_size_mode", SIZE_MODE_FIXED);
keep_aspect_button->set_pressed(EditorSettings::get_singleton()->get_project_metadata("game_view", "keep_aspect", true));
_update_embed_menu_options();
EditorRunBar::get_singleton()->connect("play_pressed", callable_mp(this, &GameView::_play_pressed));