Skip to content

Commit 634220e

Browse files
committed
Merge pull request #114971 from KoBeWi/resettings
Reorganize interface/editor setttings
2 parents bba2e01 + 1b543e8 commit 634220e

29 files changed

+361
-282
lines changed

doc/classes/EditorDock.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
The shortcut used to open the dock.
100100
</member>
101101
<member name="force_show_icon" type="bool" setter="set_force_show_icon" getter="get_force_show_icon" default="false">
102-
If [code]true[/code], the dock will always display an icon, regardless of [member EditorSettings.interface/editor/dock_tab_style] or [member EditorSettings.interface/editor/bottom_dock_tab_style].
102+
If [code]true[/code], the dock will always display an icon, regardless of [member EditorSettings.interface/editor/docks/dock_tab_style] or [member EditorSettings.interface/editor/docks/bottom_dock_tab_style].
103103
</member>
104104
<member name="global" type="bool" setter="set_global" getter="is_global" default="true">
105105
If [code]true[/code], the dock appears in the [b]Editor &gt; Editor Docks[/b] menu and can be closed. Non-global docks can still be closed using [method close] or when [member closable] is [code]true[/code].

doc/classes/EditorFileDialog.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
</brief_description>
66
<description>
77
[EditorFileDialog] is a [FileDialog] tweaked to work in the editor. It automatically handles favorite and recent directory lists, and synchronizes some properties with their corresponding editor settings.
8-
[EditorFileDialog] will automatically show a native dialog based on the [member EditorSettings.interface/editor/use_native_file_dialogs] editor setting and ignores [member FileDialog.use_native_dialog].
8+
[EditorFileDialog] will automatically show a native dialog based on the [member EditorSettings.interface/editor/appearance/use_native_file_dialogs] editor setting and ignores [member FileDialog.use_native_dialog].
99
[b]Note:[/b] [EditorFileDialog] is invisible by default. To make it visible, call one of the [code]popup_*[/code] methods from [Window] on the node, such as [method Window.popup_centered_clamped].
1010
</description>
1111
<tutorials>

doc/classes/EditorInterface.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
<return type="float" />
121121
<description>
122122
Returns the actual scale of the editor UI ([code]1.0[/code] being 100% scale). This can be used to adjust position and dimensions of the UI added by plugins.
123-
[b]Note:[/b] This value is set via the [member EditorSettings.interface/editor/display_scale] and [member EditorSettings.interface/editor/custom_display_scale] settings. The editor must be restarted for changes to be properly applied.
123+
[b]Note:[/b] This value is set via the [member EditorSettings.interface/editor/appearance/display_scale] and [member EditorSettings.interface/editor/appearance/custom_display_scale] settings. The editor must be restarted for changes to be properly applied.
124124
</description>
125125
</method>
126126
<method name="get_editor_settings" qualifiers="const">
@@ -262,7 +262,7 @@
262262
<description>
263263
Returns [code]true[/code] if multiple window support is enabled in the editor. Multiple window support is enabled if [i]all[/i] of these statements are true:
264264
- [member EditorSettings.interface/multi_window/enable] is [code]true[/code].
265-
- [member EditorSettings.interface/editor/single_window_mode] is [code]false[/code].
265+
- [member EditorSettings.interface/editor/display/single_window_mode] is [code]false[/code].
266266
- [member Viewport.gui_embed_subwindows] is [code]false[/code]. This is forced to [code]true[/code] on platforms that don't support multiple windows such as Web, or when the [code]--single-window[/code] [url=$DOCS_URL/tutorials/editor/command_line_tutorial.html]command line argument[/url] is used.
267267
</description>
268268
</method>

doc/classes/EditorSettings.xml

Lines changed: 113 additions & 113 deletions
Large diffs are not rendered by default.

doc/classes/ProjectSettings.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1091,10 +1091,10 @@
10911091
<member name="display/window/subwindows/embed_subwindows" type="bool" setter="" getter="" default="true">
10921092
If [code]true[/code], subwindows are embedded in the main window (this is also called single-window mode). Single-window mode can be faster as it does not need to create a separate window for every popup and tooltip, which can be a slow operation depending on the operating system and rendering method in use.
10931093
If [code]false[/code], subwindows are created as separate windows (this is also called multi-window mode). This allows them to be moved outside the main window and use native operating system window decorations.
1094-
This is equivalent to [member EditorSettings.interface/editor/single_window_mode] in the editor.
1094+
This is equivalent to [member EditorSettings.interface/editor/display/single_window_mode] in the editor.
10951095
</member>
10961096
<member name="display/window/vsync/vsync_mode" type="int" setter="" getter="" default="1" keywords="adaptive, mailbox">
1097-
Sets the V-Sync mode for the main game window. The editor's own V-Sync mode can be set using [member EditorSettings.interface/editor/vsync_mode].
1097+
Sets the V-Sync mode for the main game window. The editor's own V-Sync mode can be set using [member EditorSettings.interface/editor/display/vsync_mode].
10981098
See [enum DisplayServer.VSyncMode] for possible values and how they affect the behavior of your application.
10991099
Depending on the platform and rendering method, the engine will fall back to [b]Enabled[/b] if the desired mode is not supported.
11001100
V-Sync can be disabled on the command line using the [code]--disable-vsync[/code] [url=$DOCS_URL/tutorials/editor/command_line_tutorial.html]command line argument[/url].

doc/classes/ResourceImporterTexture.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
[b]Note:[/b] Only available for SVG images.
6161
</member>
6262
<member name="editor/scale_with_editor_scale" type="bool" setter="" getter="" default="false">
63-
If [code]true[/code], scales the imported image to match [member EditorSettings.interface/editor/custom_display_scale]. This should be enabled for editor plugin icons and custom class icons, but should be left disabled otherwise.
63+
If [code]true[/code], scales the imported image to match [member EditorSettings.interface/editor/appearance/custom_display_scale]. This should be enabled for editor plugin icons and custom class icons, but should be left disabled otherwise.
6464
[b]Note:[/b] Only available for SVG images.
6565
</member>
6666
<member name="mipmaps/generate" type="bool" setter="" getter="" default="false">

editor/debugger/editor_performance_profiler.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ void EditorPerformanceProfiler::_notification(int p_what) {
403403
} break;
404404

405405
case EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED: {
406-
if (EditorSettings::get_singleton()->check_changed_settings_in_group("interface/editor/localize_settings")) {
406+
if (EditorSettings::get_singleton()->check_changed_settings_in_group("interface/editor/localization/localize_settings")) {
407407
_build_monitor_tree();
408408
}
409409
} break;

editor/docks/dock_tab_container.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ void DockTabContainer::update_visibility() {
177177
}
178178

179179
DockTabContainer::TabStyle DockTabContainer::get_tab_style() const {
180-
return (TabStyle)EDITOR_GET("interface/editor/dock_tab_style").operator int();
180+
return (TabStyle)EDITOR_GET("interface/editor/docks/dock_tab_style").operator int();
181181
}
182182

183183
bool DockTabContainer::can_switch_dock() const {

editor/docks/editor_dock_manager.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ void EditorDockManager::update_docks_menu() {
185185
const Ref<Texture2D> default_icon = docks_menu->get_editor_theme_icon(SNAME("Window"));
186186
const Color closed_icon_color_mod = Color(1, 1, 1, 0.5);
187187

188-
bool global_menu = !bool(EDITOR_GET("interface/editor/use_embedded_menu")) && NativeMenu::get_singleton()->has_feature(NativeMenu::FEATURE_GLOBAL_MENU);
188+
bool global_menu = !bool(EDITOR_GET("interface/editor/appearance/use_embedded_menu")) && NativeMenu::get_singleton()->has_feature(NativeMenu::FEATURE_GLOBAL_MENU);
189189
bool dark_mode = DisplayServer::get_singleton()->is_dark_mode_supported() && DisplayServer::get_singleton()->is_dark_mode();
190190
int icon_max_width = EditorNode::get_singleton()->get_editor_theme()->get_constant(SNAME("class_icon_size"), EditorStringName(Editor));
191191

editor/docks/scene_tree_dock.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1768,8 +1768,8 @@ void SceneTreeDock::_notification(int p_what) {
17681768
scene_tree->set_hide_filtered_out_parents(EDITOR_GET("docks/scene_tree/hide_filtered_out_parents"), false);
17691769
scene_tree->set_accessibility_warnings(EDITOR_GET("docks/scene_tree/accessibility_warnings"), false);
17701770
}
1771-
if (EditorSettings::get_singleton()->check_changed_settings_in_group("interface/editor")) {
1772-
inspect_hovered_node_delay->set_wait_time(EDITOR_GET("interface/editor/dragging_hover_wait_seconds"));
1771+
if (EditorSettings::get_singleton()->check_changed_settings_in_group("interface/editor/timers")) {
1772+
inspect_hovered_node_delay->set_wait_time(EDITOR_GET("interface/editor/timers/dragging_hover_wait_seconds"));
17731773
}
17741774
} break;
17751775

0 commit comments

Comments
 (0)