Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
godot
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
community
godot
Commits
9abb415d
Unverified
Commit
9abb415d
authored
Apr 04, 2020
by
Rémi Verschelde
Committed by
GitHub
Apr 04, 2020
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #37391 from dreamsComeTrue/embedded-windows-mode
Expose 'Embedded Windows Mode' as Editor and Project Settings
parents
3d0c633e
7af84d72
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
1 deletion
+14
-1
ProjectSettings.xml
doc/classes/ProjectSettings.xml
+3
-0
editor_settings.cpp
editor/editor_settings.cpp
+2
-0
main.cpp
main/main.cpp
+9
-1
No files found.
doc/classes/ProjectSettings.xml
View file @
9abb415d
...
...
@@ -426,6 +426,9 @@
<member
name=
"display/window/ios/hide_home_indicator"
type=
"bool"
setter=
""
getter=
""
default=
"true"
>
If [code]true[/code], the home indicator is hidden automatically. This only affects iOS devices without a physical home button.
</member>
<member
name=
"display/window/subwindows/embed_subwindows"
type=
"bool"
setter=
""
getter=
""
default=
"false"
>
If [code]true[/code], uses subwindows (windows rendered entirely by engine) instead of OS-specific windows.
</member>
<member
name=
"display/window/size/always_on_top"
type=
"bool"
setter=
""
getter=
""
default=
"false"
>
Force the window to be always on top.
</member>
...
...
editor/editor_settings.cpp
View file @
9abb415d
...
...
@@ -341,6 +341,8 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
hints
[
"interface/editor/unfocused_low_processor_mode_sleep_usec"
]
=
PropertyInfo
(
Variant
::
FLOAT
,
"interface/editor/unfocused_low_processor_mode_sleep_usec"
,
PROPERTY_HINT_RANGE
,
"1,100000,1"
,
PROPERTY_USAGE_DEFAULT
|
PROPERTY_USAGE_RESTART_IF_CHANGED
);
_initial_set
(
"interface/editor/separate_distraction_mode"
,
false
);
_initial_set
(
"interface/editor/automatically_open_screenshots"
,
true
);
_initial_set
(
"interface/editor/single_window_mode"
,
false
);
hints
[
"interface/editor/single_window_mode"
]
=
PropertyInfo
(
Variant
::
BOOL
,
"interface/editor/single_window_mode"
,
PROPERTY_HINT_NONE
,
""
,
PROPERTY_USAGE_DEFAULT
|
PROPERTY_USAGE_RESTART_IF_CHANGED
);
_initial_set
(
"interface/editor/hide_console_window"
,
false
);
_initial_set
(
"interface/editor/save_each_scene_on_quit"
,
true
);
// Regression
_initial_set
(
"interface/editor/quit_confirmation"
,
true
);
...
...
main/main.cpp
View file @
9abb415d
...
...
@@ -1723,7 +1723,9 @@ bool Main::start() {
}
#endif
if
(
single_window
)
{
bool
embed_subwindows
=
GLOBAL_DEF
(
"display/window/subwindows/embed_subwindows"
,
false
);
if
(
single_window
||
(
!
project_manager
&&
!
editor
&&
embed_subwindows
))
{
sml
->
get_root
()
->
set_embed_subwindows_hint
(
true
);
}
ResourceLoader
::
add_custom_loaders
();
...
...
@@ -1942,6 +1944,12 @@ bool Main::start() {
#ifdef TOOLS_ENABLED
if
(
editor
)
{
bool
editor_embed_subwindows
=
EditorSettings
::
get_singleton
()
->
get_setting
(
"interface/editor/single_window_mode"
);
if
(
editor_embed_subwindows
)
{
sml
->
get_root
()
->
set_embed_subwindows_hint
(
true
);
}
if
(
game_path
!=
GLOBAL_GET
(
"application/run/main_scene"
)
||
!
editor_node
->
has_scenes_in_session
())
{
Error
serr
=
editor_node
->
load_scene
(
local_game_path
);
if
(
serr
!=
OK
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment