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

Make TextureButton and Button update on texture change #77159

Merged
merged 1 commit into from
May 29, 2023
Merged

Make TextureButton and Button update on texture change #77159

merged 1 commit into from
May 29, 2023
+53 −31

Conversation

AThousandShips
Copy link
Member

@AThousandShips AThousandShips commented May 17, 2023 •
edited
Loading

Fixes: #63801 (partially)

Using the approach from #75532

Does not work for click_mask as BitMap does not use the changed signal, out of scope for this PR to add that

@AThousandShips AThousandShips requested a review from a team as a code owner May 17, 2023 13:15
@AThousandShips
Copy link
Member Author

Realized the bug was about Button, will add fix for it too

@AThousandShips AThousandShips changed the title Make TextureButton update on texture change Make TextureButton and Button update on texture change May 17, 2023
@akien-mga akien-mga added this to the 4.1 milestone May 17, 2023
groud
groud approved these changes May 29, 2023
View reviewed changes
Copy link
Member

@groud groud left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Looks good to me, good job! I've added a comment but I am not 100% it is relevant.
Thanks!

scene/gui/texture_button.cpp Show resolved Hide resolved
@AThousandShips AThousandShips force-pushed the texture_button_fix branch 2 times, most recently from 877c28c to 9310576 Compare May 29, 2023 12:59
@YuriSizov YuriSizov merged commit f3983b5 into godotengine:master May 29, 2023
@YuriSizov
Copy link
Contributor

Thanks! That should actually address some editor issues with custom type icons too.

@AThousandShips
Copy link
Member Author

Thank you!

@AThousandShips AThousandShips deleted the texture_button_fix branch May 29, 2023 15:32
@KoBeWi KoBeWi mentioned this pull request Jun 4, 2023
Merged
@AThousandShips
Copy link
Member Author

Should I go ahead and cherry-pick this one as #75016 is getting a 3.x version?

@YuriSizov
Copy link
Contributor

@AThousandShips Yes, sure, I think we can backport both changes.

@AThousandShips
Copy link
Member Author

Then I'll open, tested it out and code works

@AThousandShips AThousandShips mentioned this pull request Aug 29, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@KoBeWi KoBeWi KoBeWi left review comments

@groud groud groud approved these changes

@YuriSizov YuriSizov YuriSizov approved these changes

Assignees
No one assigned
Labels
bug topic:gui
Projects
None yet
Milestone
4.1
Development

Successfully merging this pull request may close these issues.

MeshTexture behaves poorly when used as icon on Button
5 participants
@AThousandShips @YuriSizov @KoBeWi @groud @akien-mga