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

Add support for partial custom editor themes #51651

Merged
merged 1 commit into from
Aug 17, 2021

Conversation

YuriSizov
Copy link
Contributor

@YuriSizov YuriSizov commented Aug 13, 2021

A master version of #51648.

Additionally this PR removes copy_theme() and copy_default_theme() from the Theme resource. Frankly, I don't see a point in them, and they weren't consistent. All resource items (icons, styleboxes, fonts) were added to the base theme, while all the other, primitive types were completely replaced. So I am not sure what the actual purpose of the methods has been, but if anyone relied on it — it was probably a bad decision. I've removed the only place in the editor where we relied on one of them (because it wasn't actually necessary).

The new merge_with() can be used to add all items from another theme, and standard duplicate() can be called if you want a copy of the resource. So I think the removal of those two methods is justified.

@YuriSizov YuriSizov added this to the 4.0 milestone Aug 13, 2021
@YuriSizov YuriSizov requested a review from a team August 13, 2021 23:19
@YuriSizov YuriSizov requested a review from a team as a code owner August 13, 2021 23:19
@akien-mga akien-mga merged commit 45344c6 into godotengine:master Aug 17, 2021
@akien-mga
Copy link
Member

Thanks!

@YuriSizov YuriSizov deleted the editor-merge-custom-theme branch August 17, 2021 11:32
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.

2 participants