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

Merge pull request #71553 from RandomShaper/no_catastrophic_relayout

Browse Source 
Prevent infinite cascade of re-layout after label text reshaping
This commit is contained in:
Rémi Verschelde 2023-01-17 15:00:11 +01:00
commit 9ebb3e3107
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scene/gui/label.cpp
View File

@ -222,6 +222,7 @@ void Label::_shape() {
} }
} }
lines_dirty = false; lines_dirty = false;
lines_shaped_last_width = get_size().width;
} }
_update_visible(); _update_visible();
@ -596,7 +597,13 @@ void Label::_notification(int p_what) {
} break; } break;
case NOTIFICATION_RESIZED: { case NOTIFICATION_RESIZED: {
// It may happen that the reshaping due to this size change triggers a cascade of re-layout
// across the hierarchy where this label belongs to in a way that its size changes multiple
// times, but ending up with the original size it was already shaped for.
// This check prevents the catastrophic, freezing infinite cascade of re-layout.
if (lines_shaped_last_width != get_size().width) {
lines_dirty = true; lines_dirty = true;
}
} break; } break;
} }
} }

2
scene/gui/label.h
View File

@ -49,6 +49,8 @@ private:
bool uppercase = false; bool uppercase = false;
bool lines_dirty = true; bool lines_dirty = true;
int lines_shaped_last_width = -1;
bool dirty = true; bool dirty = true;
bool font_dirty = true; bool font_dirty = true;
RID text_rid; RID text_rid;