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

Fixed Text Component order for color #596

Merged
merged 2 commits into from
Sep 17, 2024

Conversation

francisconoriega
Copy link
Contributor

Addressing #591

Reverts Text component logic for getting the color to one that matches Material, which is one that respects the caller's passed in parameters first (color, then the color in the textStyle), and then falls back to localContentColor.

The code originally used what I propose here, but was later swapped to solve a bug with Tooltip + LightTheme: https://github.com/JetBrains/jewel/pull/180/files#r1361761781, but I believe this is the correct fix.

I tested that tooltip still works on ide + standalone, on light and dark

Copy link
Collaborator

@rock3r rock3r left a comment

Choose a reason for hiding this comment

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

Thank you for testing! I suspect we had a bug that was masked by this change, but yeah it makes sense for the order to be this, here.

@rock3r rock3r merged commit db7e053 into JetBrains:main Sep 17, 2024
1 check passed
@rock3r rock3r linked an issue Sep 20, 2024 that may be closed by this pull request
rock3r pushed a commit that referenced this pull request Sep 24, 2024
Fixed Null Pointer in IDE sample on non INTUI themes

Co-authored-by: Francisco Noriega <francisco.noriega@airbnb.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Text Component has wrong order for color
2 participants