Make settings_changed signal less emitted

Author: KoBeWi

core/config/project_settings.cpp

@@ -298,7 +298,7 @@ bool ProjectSettings::_set(const StringName &p_name, const Variant &p_value) {
 			}
 
 			_version++;
-			_queue_changed();
+			queue_changed();
 			return true;
 		}
 
@@ -344,7 +344,7 @@ bool ProjectSettings::_set(const StringName &p_name, const Variant &p_value) {
 	}
 
 	_version++;
-	_queue_changed();
+	queue_changed();
 	return true;
 }
 
@@ -501,8 +501,8 @@ void ProjectSettings::_get_property_list(List<PropertyInfo> *p_list) const {
 	}
 }
 
-void ProjectSettings::_queue_changed() {
-	if (is_changed || !MessageQueue::get_singleton() || MessageQueue::get_singleton()->get_max_buffer_usage() == 0) {
+void ProjectSettings::queue_changed() {
+	if (block_changed || is_changed || !MessageQueue::get_singleton() || MessageQueue::get_singleton()->get_max_buffer_usage() == 0) {
 		return;
 	}
 	is_changed = true;
@@ -1119,7 +1119,9 @@ Error ProjectSettings::save_custom(const String &p_path, const CustomMap &p_cust
 		}
 	}
 	project_features = _trim_to_supported_features(project_features);
+	block_changed = true;
 	set_setting("application/config/features", project_features);
+	block_changed = false;
 #endif // TOOLS_ENABLED
 
 	RBSet<_VCSort> vclist;
@@ -1199,18 +1201,22 @@ Error ProjectSettings::save_custom(const String &p_path, const CustomMap &p_cust
 }
 
 Variant _GLOBAL_DEF(const String &p_var, const Variant &p_default, bool p_restart_if_changed, bool p_ignore_value_in_docs, bool p_basic, bool p_internal) {
+	ProjectSettings *ps = ProjectSettings::get_singleton();
+
 	Variant ret;
-	if (!ProjectSettings::get_singleton()->has_setting(p_var)) {
-		ProjectSettings::get_singleton()->set(p_var, p_default);
+	if (!ps->has_setting(p_var)) {
+		ps->set_block_changed(true); // Prevents emitting change during initialization.
+		ps->set(p_var, p_default);
+		ps->set_block_changed(false);
 	}
 	ret = GLOBAL_GET(p_var);
 
-	ProjectSettings::get_singleton()->set_initial_value(p_var, p_default);
-	ProjectSettings::get_singleton()->set_builtin_order(p_var);
-	ProjectSettings::get_singleton()->set_as_basic(p_var, p_basic);
-	ProjectSettings::get_singleton()->set_restart_if_changed(p_var, p_restart_if_changed);
-	ProjectSettings::get_singleton()->set_ignore_value_in_docs(p_var, p_ignore_value_in_docs);
-	ProjectSettings::get_singleton()->set_as_internal(p_var, p_internal);
+	ps->set_initial_value(p_var, p_default);
+	ps->set_builtin_order(p_var);
+	ps->set_as_basic(p_var, p_basic);
+	ps->set_restart_if_changed(p_var, p_restart_if_changed);
+	ps->set_ignore_value_in_docs(p_var, p_ignore_value_in_docs);
+	ps->set_as_internal(p_var, p_internal);
 	return ret;
 }
 

core/config/project_settings.h

@@ -96,6 +96,7 @@ class ProjectSettings : public Object {
 	HashMap<StringName, PropertyInfo> custom_prop_info;
 	bool using_datapack = false;
 	bool project_loaded = false;
+	bool block_changed = false;
 	List<String> input_presets;
 
 	HashSet<String> custom_features;
@@ -117,7 +118,6 @@ class ProjectSettings : public Object {
 	bool _property_can_revert(const StringName &p_name) const;
 	bool _property_get_revert(const StringName &p_name, Variant &r_property) const;
 
-	void _queue_changed();
 	void _emit_changed();
 
 	static inline ProjectSettings *singleton = nullptr;
@@ -160,6 +160,9 @@ class ProjectSettings : public Object {
 	void store_global_class_list(const Array &p_classes);
 	String get_global_class_list_path() const;
 
+	void queue_changed();
+	void set_block_changed(bool p_block) { block_changed = p_block; }
+
 	bool has_setting(const String &p_var) const;
 	String localize_path(const String &p_path) const;
 	String globalize_path(const String &p_path) const;

editor/editor_sectioned_inspector.cpp

@@ -30,6 +30,7 @@
 
 #include "editor_sectioned_inspector.h"
 
+#include "core/config/project_settings.h"
 #include "editor/editor_inspector.h"
 #include "editor/editor_property_name_processor.h"
 #include "editor/editor_string_names.h"
@@ -69,8 +70,18 @@ class SectionedInspectorFilter : public Object {
 			name = section + "/" + name;
 		}
 
+		ProjectSettings *ps = ProjectSettings::get_singleton();
+		if (ps) {
+			// Small hack to block emitting of "settings_changed" signal unnecessarily.
+			// It's handled by ProjectSettingsEditor.
+			ps->set_block_changed(true);
+		}
+
 		bool valid;
 		edited->set(name, p_value, &valid);
+		if (ps) {
+			ps->set_block_changed(false);
+		}
 		return valid;
 	}
 

editor/project_settings_editor.cpp

@@ -82,6 +82,7 @@ void ProjectSettingsEditor::_save() {
 	settings_changed = false;
 	if (ps) {
 		ps->save();
+		ps->queue_changed();
 	}
 }
 
@@ -792,7 +793,7 @@ ProjectSettingsEditor::ProjectSettingsEditor(EditorData *p_data) {
 	tab_container->add_child(plugin_settings);
 
 	timer = memnew(Timer);
-	timer->set_wait_time(1.5);
+	timer->set_wait_time(1.0);
 	timer->connect("timeout", callable_mp(this, &ProjectSettingsEditor::_save));
 	timer->set_one_shot(true);
 	add_child(timer);