asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #42338 from godotengine/revert-41697-bug/editor-inspector-refresh-fix

Browse source 
Revert "Fix editor inspector refresh not working"
This commit is contained in:
Rémi Verschelde 2020-09-25 21:01:24 +02:00 committed by GitHub
commit fea72f2a71
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
editor/editor_inspector.cpp
View file

@ -1969,7 +1969,7 @@ void EditorInspector::refresh() {
if (refresh_countdown > 0 || changing) { if (refresh_countdown > 0 || changing) {
return; return;
} }
refresh_countdown = refresh_interval_cache; refresh_countdown = EditorSettings::get_singleton()->get("docks/property_editor/auto_refresh_interval");
} }
Object *EditorInspector::get_edited_object() { Object *EditorInspector::get_edited_object() {
@ -2332,8 +2332,6 @@ void EditorInspector::_node_removed(Node *p_node) {
void EditorInspector::_notification(int p_what) { void EditorInspector::_notification(int p_what) {
if (p_what == NOTIFICATION_READY) { if (p_what == NOTIFICATION_READY) {
EditorFeatureProfileManager::get_singleton()->connect("current_feature_profile_changed", callable_mp(this, &EditorInspector::_feature_profile_changed)); EditorFeatureProfileManager::get_singleton()->connect("current_feature_profile_changed", callable_mp(this, &EditorInspector::_feature_profile_changed));
refresh_interval_cache = EDITOR_GET("docks/property_editor/auto_refresh_interval");
refresh_countdown = refresh_interval_cache;
} }
if (p_what == NOTIFICATION_ENTER_TREE) { if (p_what == NOTIFICATION_ENTER_TREE) {
@ -2369,9 +2367,6 @@ void EditorInspector::_notification(int p_what) {
} }
} }
} }
} else {
// Restart countdown if <= 0
refresh_countdown = refresh_interval_cache;
} }
changing++; changing++;
@ -2404,9 +2399,6 @@ void EditorInspector::_notification(int p_what) {
add_theme_style_override("bg", get_theme_stylebox("bg", "Tree")); add_theme_style_override("bg", get_theme_stylebox("bg", "Tree"));
} }
refresh_interval_cache = EDITOR_GET("docks/property_editor/auto_refresh_interval");
refresh_countdown = refresh_interval_cache;
update_tree(); update_tree();
} }
} }
@ -2570,7 +2562,6 @@ EditorInspector::EditorInspector() {
update_all_pending = false; update_all_pending = false;
update_tree_pending = false; update_tree_pending = false;
refresh_countdown = 0; refresh_countdown = 0;
refresh_interval_cache = 0;
read_only = false; read_only = false;
search_box = nullptr; search_box = nullptr;
keying = false; keying = false;

1
editor/editor_inspector.h
View file

@ -294,7 +294,6 @@ class EditorInspector : public ScrollContainer {
bool deletable_properties; bool deletable_properties;
float refresh_countdown; float refresh_countdown;
float refresh_interval_cache;
bool update_tree_pending; bool update_tree_pending;
StringName _prop_edited; StringName _prop_edited;
StringName property_selected; StringName property_selected;