godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #77651 from Rindbee/fix-update-minimum-size

Browse Source 
Make sure that `data.last_minimum_size` is consistent with `get_combined_minimum_size()` at the same time
This commit is contained in:
Yuri Sizov 2023-06-02 14:02:04 +02:00 committed by GitHub
commit ca1b4eb225
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
scene/gui/control.cpp
View File

@ -1582,22 +1582,6 @@ void Control::_update_minimum_size() {
return; return;
} }
Size2 minsize = get_combined_minimum_size();
data.updating_last_minimum_size = false;
if (minsize != data.last_minimum_size) {
data.last_minimum_size = minsize;
_size_changed();
emit_signal(SceneStringNames::get_singleton()->minimum_size_changed);
}
}
void Control::update_minimum_size() {
ERR_MAIN_THREAD_GUARD;
if (!is_inside_tree() || data.block_minimum_size_adjust) {
return;
}
Control *invalidate = this; Control *invalidate = this;
// Invalidate cache upwards. // Invalidate cache upwards.
@ -1620,6 +1604,21 @@ void Control::update_minimum_size() {
return; return;
} }
Size2 minsize = get_combined_minimum_size();
data.updating_last_minimum_size = false;
if (minsize != data.last_minimum_size) {
data.last_minimum_size = minsize;
_size_changed();
emit_signal(SceneStringNames::get_singleton()->minimum_size_changed);
}
}
void Control::update_minimum_size() {
ERR_MAIN_THREAD_GUARD;
if (!is_inside_tree() || data.block_minimum_size_adjust) {
return;
}
if (data.updating_last_minimum_size) { if (data.updating_last_minimum_size) {
return; return;
} }
@ -3140,7 +3139,6 @@ void Control::_notification(int p_notification) {
} break; } break;
case NOTIFICATION_POST_ENTER_TREE: { case NOTIFICATION_POST_ENTER_TREE: {
data.minimum_size_valid = false;
data.is_rtl_dirty = true; data.is_rtl_dirty = true;
_size_changed(); _size_changed();
} break; } break;
@ -3269,9 +3267,7 @@ void Control::_notification(int p_notification) {
get_viewport()->_gui_hide_control(this); get_viewport()->_gui_hide_control(this);
} }
} else { } else {
data.minimum_size_valid = false;
_update_minimum_size(); _update_minimum_size();
_size_changed();
} }
} break; } break;