seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

EditorRun: Load override.cfg to get window configuration for embedded mode

Browse Source
This commit is contained in:
Rémi Verschelde
2025-10-08 16:14:21 +02:00
parent 7864ac8019
commit 42000e27fe
1 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
editor/run/editor_run.cpp
View File

@ -31,6 +31,7 @@
#include "editor_run.h"
#include "core/config/project_settings.h"
#include "core/io/config_file.h"
#include "editor/debugger/editor_debugger_node.h"
#include "editor/editor_node.h"
#include "editor/run/run_instances_dialog.h"
@ -255,12 +256,24 @@ EditorRun::WindowPlacement EditorRun::get_window_placement() {
placement.screen = DisplayServer::get_singleton()->get_primary_screen();
}
placement.size.x = GLOBAL_GET("display/window/size/viewport_width");
placement.size.y = GLOBAL_GET("display/window/size/viewport_height");
Ref<ConfigFile> cfg_override;
cfg_override.instantiate();
if (!bool(GLOBAL_GET("application/config/disable_project_settings_override")) && FileAccess::exists("res://override.cfg")) {
Error err = cfg_override->load("res://override.cfg");
if (err != OK) {
WARN_PRINT("Found override.cfg but could not load it.");
}
}
#define GET_CONFIG_WITH_OVERRIDE(m_section, m_key) \
cfg_override->get_value(m_section, m_key, GLOBAL_GET(vformat("%s/%s", m_section, m_key)))
placement.size.x = GET_CONFIG_WITH_OVERRIDE("display", "window/size/viewport_width");
placement.size.y = GET_CONFIG_WITH_OVERRIDE("display", "window/size/viewport_height");
Size2 desired_size;
desired_size.x = GLOBAL_GET("display/window/size/window_width_override");
desired_size.y = GLOBAL_GET("display/window/size/window_height_override");
desired_size.x = GET_CONFIG_WITH_OVERRIDE("display", "window/size/window_width_override");
desired_size.y = GET_CONFIG_WITH_OVERRIDE("display", "window/size/window_height_override");
if (desired_size.x > 0 && desired_size.y > 0) {
placement.size = desired_size;
}
@ -270,7 +283,7 @@ EditorRun::WindowPlacement EditorRun::get_window_placement() {
int window_placement = EDITOR_GET("run/window_placement/rect");
if (screen_rect != Rect2()) {
if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_HIDPI)) {
bool hidpi_proj = GLOBAL_GET("display/window/dpi/allow_hidpi");
bool hidpi_proj = GET_CONFIG_WITH_OVERRIDE("display", "window/dpi/allow_hidpi");
int display_scale = 1;
if (OS::get_singleton()->is_hidpi_allowed()) {
@ -323,6 +336,8 @@ EditorRun::WindowPlacement EditorRun::get_window_placement() {
}
}
#undef GET_CONFIG_WITH_OVERRIDE
return placement;
}