hertog/godot-module-template
Template
2
1
Fork 1
Code Issues 2 Pull requests 2 Projects Releases Packages Wiki Activity Actions

Remove restart requirement for interface/touchscreen/enable_touch_optimizations setting

Browse source
This commit is contained in:
ryevdokimov 2026-03-08 15:42:55 -04:00
parent 220b0b2f74
commit 91a85af575
8 changed files with 38 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
editor/docks/editor_dock_manager.cpp
View file

@ -50,6 +50,17 @@
////////////////////////////////////////////////
////////////////////////////////////////////////
void DockSplitContainer::_notification(int p_what) {
switch (p_what) {
case EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED: {
if (!EditorSettings::get_singleton()->check_changed_settings_in_group("interface/touchscreen")) {
return;
}
set_touch_dragger_enabled(EDITOR_GET("interface/touchscreen/enable_touch_optimizations"));
} break;
}
}
void DockSplitContainer::_update_visibility() {
if (is_updating) {
return;

1
editor/docks/editor_dock_manager.h
View file

@ -52,6 +52,7 @@ private:
bool is_updating = false;
protected:
void _notification(int p_what);
void _update_visibility();
virtual void add_child_notify(Node *p_child) override;

22
editor/export/project_export.cpp
View file

@ -111,6 +111,12 @@ void ProjectExportDialog::_notification(int p_what) {
}
} break;
case EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED: {
if (EditorSettings::get_singleton()->check_changed_settings_in_group("interface/touchscreen")) {
main_split->set_touch_dragger_enabled(EDITOR_GET("interface/touchscreen/enable_touch_optimizations"));
}
} break;
case NOTIFICATION_THEME_CHANGED: {
_script_encryption_key_visibility_changed(show_script_key->is_pressed());
duplicate_preset->set_button_icon(presets->get_editor_theme_icon(SNAME("Duplicate")));
@ -1534,19 +1540,17 @@ ProjectExportDialog::ProjectExportDialog() {
VBoxContainer *main_vb = memnew(VBoxContainer);
add_child(main_vb);
HSplitContainer *hbox = memnew(HSplitContainer);
main_vb->add_child(hbox);
hbox->set_v_size_flags(Control::SIZE_EXPAND_FILL);
if (EDITOR_GET("interface/touchscreen/enable_touch_optimizations")) {
hbox->set_touch_dragger_enabled(true);
}
main_split = memnew(HSplitContainer);
main_vb->add_child(main_split);
main_split->set_v_size_flags(Control::SIZE_EXPAND_FILL);
main_split->set_touch_dragger_enabled(EDITOR_GET("interface/touchscreen/enable_touch_optimizations"));
// Presets list.
VBoxContainer *preset_vb = memnew(VBoxContainer);
preset_vb->set_h_size_flags(Control::SIZE_EXPAND_FILL);
preset_vb->set_stretch_ratio(0.35);
hbox->add_child(preset_vb);
main_split->add_child(preset_vb);
Label *l = memnew(Label(TTR("Presets")));
l->set_theme_type_variation("HeaderSmall");
@ -1586,7 +1590,7 @@ ProjectExportDialog::ProjectExportDialog() {
settings_vb = memnew(VBoxContainer);
settings_vb->hide();
settings_vb->set_h_size_flags(Control::SIZE_EXPAND_FILL);
hbox->add_child(settings_vb);
main_split->add_child(settings_vb);
PanelContainer *panel = memnew(PanelContainer);
panel->set_theme_type_variation(SNAME("PanelForeground"));
@ -1935,7 +1939,7 @@ ProjectExportDialog::ProjectExportDialog() {
empty_label->set_h_size_flags(Control::SIZE_EXPAND_FILL);
empty_label->set_v_size_flags(Control::SIZE_EXPAND_FILL);
empty_label->hide();
hbox->add_child(empty_label);
main_split->add_child(empty_label);
// Deletion dialog.

2
editor/export/project_export.h
View file

@ -36,6 +36,7 @@
class CheckBox;
class CheckButton;
class HSplitContainer;
class EditorFileDialog;
class EditorFileSystemDirectory;
class EditorInspector;
@ -73,6 +74,7 @@ public:
class ProjectExportDialog : public ConfirmationDialog {
GDCLASS(ProjectExportDialog, ConfirmationDialog);
HSplitContainer *main_split = nullptr;
TabContainer *sections = nullptr;
MenuButton *add_preset = nullptr;

1
editor/settings/editor_settings.cpp
View file

@ -625,7 +625,6 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
bool is_native_touchscreen = has_touchscreen_ui && !OS::get_singleton()->has_feature("xr_editor"); // Disable some touchscreen settings by default for the XR Editor.
EDITOR_SETTING(Variant::BOOL, PROPERTY_HINT_NONE, "interface/touchscreen/enable_touch_optimizations", is_native_touchscreen, "")
set_restart_if_changed("interface/touchscreen/enable_touch_optimizations", true);
EDITOR_SETTING(Variant::BOOL, PROPERTY_HINT_NONE, "interface/touchscreen/enable_long_press_as_right_click", is_native_touchscreen, "")
set_restart_if_changed("interface/touchscreen/enable_long_press_as_right_click", true);

4
editor/settings/editor_settings_dialog.cpp
View file

@ -304,6 +304,10 @@ void EditorSettingsDialog::_notification(int p_what) {
if (EditorSettings::get_singleton()->check_changed_settings_in_group("interface/editor/localization/localize_settings")) {
inspector->update_category_list();
}
if (EditorSettings::get_singleton()->check_changed_settings_in_group("interface/touchscreen")) {
inspector->set_touch_dragger_enabled(EDITOR_GET("interface/touchscreen/enable_touch_optimizations"));
}
} break;
}
}

6
editor/settings/project_settings_editor.cpp
View file

@ -678,6 +678,12 @@ void ProjectSettingsEditor::_notification(int p_what) {
case NOTIFICATION_THEME_CHANGED: {
_update_theme();
} break;
case EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED: {
if (EditorSettings::get_singleton()->check_changed_settings_in_group("interface/touchscreen")) {
general_settings_inspector->set_touch_dragger_enabled(EDITOR_GET("interface/touchscreen/enable_touch_optimizations"));
}
} break;
}
}

1
editor/themes/editor_theme_manager.cpp
View file

@ -718,6 +718,7 @@ bool EditorThemeManager::is_generated_theme_outdated() {
// TODO: We can use this information more intelligently to do partial theme updates and speed things up.
outdated_cache = EditorSettings::get_singleton()->check_changed_settings_in_group("interface/theme") ||
EditorSettings::get_singleton()->check_changed_settings_in_group("interface/editor/fonts") ||
EditorSettings::get_singleton()->check_changed_settings_in_group("interface/touchscreen/enable_touch_optimizations") ||
EditorSettings::get_singleton()->check_changed_settings_in_group("editors/visual_editors") ||
EditorSettings::get_singleton()->check_changed_settings_in_group("text_editor/theme") ||
EditorSettings::get_singleton()->check_changed_settings_in_group("text_editor/help/help") ||