Avoid FlowContainer crash with TextureRect using EXPAND_FIT_* expand modes
#94286
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
KoBeWi
reviewed
Jul 20, 2024
…modes When a FlowContainer had a TextureRect child using any of the EXPAND_FIT_* expand modes, it could crash when changing the FlowContainer's minimum size, or that of its children. This was due to the TextureRect resizing in FlowContainer::_resort, updating its minimum size, and triggering another _resort. If the TextureRect's minimum size changed in a way that caused any of the FlowContainer's children to be put on a different line, it could repeatedly cause _resort to be called again, moving the children back and forth between the old and new lines. This change is for FlowContainer::_resort to give a warning for TextureRects with EXPAND_FIT_* expand modes when multiple lines are used, and just keep the TextureRect size the same in that case. This is similar to the check added to AspectRatioContainer in godotengine#73396, but attempting to still support it in FlowContainer when possible. In the case where the TextureRect is forced to stay the same size, there may be some overlap between the FlowContainer's children, but should no longer crash.
aaronp64
force-pushed
the
flowcontainer_resort_crash
branch
from
7425f49 to
5682cc7
Compare
KoBeWi
approved these changes
Jul 21, 2024
|
Thanks! |
akien-mga
changed the title
FlowContainer crash with TextureRect using EXPAND_FIT_* expand modesFlowContainer crash with TextureRect using EXPAND_FIT_* expand modes
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When a
FlowContainerhad aTextureRectchild using any of the EXPAND_FIT_* expand modes, it could crash when changing theFlowContainer's minimum size, or that of its children. This was due to theTextureRectresizing inFlowContainer::_resort, updating its minimum size, and triggering another_resort. If theTextureRect's minimum size changed in a way that caused any of theFlowContainer's children to be put on a different line, it could repeatedly cause_resortto be called again, moving the children back and forth between the old and new lines.This change is for
FlowContainer::_resortto give a warning forTextureRects with EXPAND_FIT_* expand modes when multiple lines are used, and just keep theTextureRectsize the same in that case. This is similar to the check added toAspectRatioContainerin #73396, but attempting to still support it inFlowContainerwhen possible. In the case where theTextureRectis forced to stay the same size, there may be some overlap between theFlowContainer's children, but should no longer crash.Fixes #93767