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.

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

[3.x] PopupMenu rework and enhancements #66711

Merged
merged 1 commit into from
Jan 23, 2023

Conversation

rsubtil
Copy link
Contributor

@rsubtil rsubtil commented Oct 1, 2022

Backport of #41640 for 3.x (cc @EricEzaM)

From my tests I didn't encounter any major breaking changes but there might be details about the popup behavior that I've missed.

I've done my best to port the PR with minimal changes, but also avoid having to massively change the existing codebase to accommodate for it. The only major deviation I had to do was adding in the variable max_size for setting the size, since that variable comes from Window, which Popup was refactored to be a child of it (#37317)

@rsubtil rsubtil requested review from a team as code owners October 1, 2022 15:26
@KoBeWi KoBeWi added this to the 3.x milestone Oct 1, 2022
Copy link
Contributor

@EricEzaM EricEzaM left a comment

Choose a reason for hiding this comment

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

Did you take the changes straight from the diff of that PR? If so you may want to look at the current state of PopupMenu to see if anything else has been added to fix bugs etc.

doc/classes/PopupMenu.xml Outdated Show resolved Hide resolved
scene/gui/popup_menu.cpp Outdated Show resolved Hide resolved
scene/gui/popup_menu.cpp Outdated Show resolved Hide resolved
@rsubtil
Copy link
Contributor Author

rsubtil commented Oct 2, 2022

It's a mix. I started by cherry-picking your commit and fixing conflicts, but then I compared with both master and 3.x, and did a few changes, some to fix bugs and others to keep current 3.x behavior.

Many scrolling behaviour improvements and the ability to limit popup size.
rsubtil pushed a commit to retrohub-org/godot that referenced this pull request Jan 22, 2023
@akien-mga akien-mga modified the milestones: 3.x, 3.6 Jan 23, 2023
@akien-mga akien-mga merged commit dd7f517 into godotengine:3.x Jan 23, 2023
@akien-mga
Copy link
Member

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants