Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix FlowContainer scale from also scaling wrap point #93444

Merged
merged 1 commit into from
Jun 22, 2024
Merged

Fix FlowContainer scale from also scaling wrap point #93444

merged 1 commit into from
Jun 22, 2024

Conversation

JaviARodriguez
Copy link
Contributor

When a FlowContainer was scaled, the point at which a line wraps would also be scaled. This would cause a FlowContainer to have lines that did not fit the container.

FlowContainer no longer factors its scale when resorting children.

Fixes #93439

@JaviARodriguez
Fix FlowContainer scale from also scaling wrap point
d6e17b8 
When a FlowContainer was scaled, the point at which a line wraps would
also be scaled. This would cause a FlowContainer to have lines that did
not fit the container.

FlowContainer no longer factors its scale when resorting children.

Fixes godotengine#93439
@JaviARodriguez JaviARodriguez requested a review from a team as a code owner June 21, 2024 23:24
@Calinou Calinou added bug topic:gui cherrypick:4.2 Considered for cherry-picking into a future 4.2.x release labels Jun 21, 2024
@Calinou Calinou added this to the 4.3 milestone Jun 21, 2024
kleonc
kleonc approved these changes Jun 22, 2024
View reviewed changes
Copy link
Member

@kleonc kleonc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense to me (if using a rect it should rather be using get_anchorable_rect() instead of get_rect(); and using get_size() to get only the size is equivalent).

@akien-mga akien-mga merged commit e526f12 into godotengine:master Jun 22, 2024
16 checks passed
@akien-mga
Copy link
Member

Thanks!

@kleonc
Copy link
Member

kleonc commented Jun 22, 2024

Thanks!

And congrats for your first merged Godot contribution @JaviARodriguez 🎉

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kleonc kleonc kleonc approved these changes

Assignees
No one assigned
Labels
bug cherrypick:4.2 Considered for cherry-picking into a future 4.2.x release topic:gui
Projects
None yet
Milestone
4.3
Development

Successfully merging this pull request may close these issues.

FlowContainer Scale also scales the wrap breakpoint
4 participants
@JaviARodriguez @akien-mga @kleonc @Calinou