diff options
| author | Jacob Edie <jacobedie1@gmail.com> | 2020-09-14 18:52:45 -0400 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2021-09-15 10:20:50 +0200 |
| commit | 2b292a1a2ad7c0a74ea186d9f53afa70b65d390f (patch) | |
| tree | de5262a16dd18bc18daf7a9cd65643dbe4aeb046 /main | |
| parent | 173c0f8737ff60c433303e3023a0852faa3cb352 (diff) | |
| download | redot-engine-2b292a1a2ad7c0a74ea186d9f53afa70b65d390f.tar.gz | |
--single-window is passed through project manager.
This means you can start godot with --single-window
Diffstat (limited to 'main')
| -rw-r--r-- | main/main.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/main/main.cpp b/main/main.cpp index 94fed8aa6e..5513e571d6 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -135,7 +135,6 @@ static int audio_driver_idx = -1; // Engine config/tools -static bool single_window = false; static bool editor = false; static bool project_manager = false; static bool cmdline_tool = false; @@ -755,7 +754,7 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph } } else if (I->get() == "--single-window") { // force single window - single_window = true; + OS::get_singleton()->_single_window = true; } else if (I->get() == "-t" || I->get() == "--always-on-top") { // force always-on-top window init_always_on_top = true; @@ -2131,7 +2130,7 @@ bool Main::start() { bool embed_subwindows = GLOBAL_DEF("display/window/subwindows/embed_subwindows", false); - if (single_window || (!project_manager && !editor && embed_subwindows)) { + if (OS::get_singleton()->is_single_window() || (!project_manager && !editor && embed_subwindows)) { sml->get_root()->set_embed_subwindows_hint(true); } ResourceLoader::add_custom_loaders(); |