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

Restore PathIcon Foreground setter in Fluent theme #12789

Merged
merged 4 commits into from
Sep 21, 2023
Merged

Restore PathIcon Foreground setter in Fluent theme #12789

merged 4 commits into from
Sep 21, 2023

Conversation

wieslawsoltes
Copy link
Collaborator

What does the pull request do?

Restores PathIcon Foreground setter in Fluent theme

What is the current behavior?

PathIcon Foreground setter is missing Fluent theme, Simple theme has it

What is the updated/expected behavior with this PR?

PathIcon Foreground is set correctly in Dark and Light theme

How was the solution implemented (if it's not obvious)?

Checklist

Breaking changes

Obsoletions / Deprecations

Fixed issues

@wieslawsoltes wieslawsoltes mentioned this pull request Sep 5, 2023
Merged
66 tasks
maxkatz6
maxkatz6 reviewed Sep 6, 2023
View reviewed changes
src/Avalonia.Themes.Fluent/Controls/PathIcon.xaml Outdated
@@ -10,6 +10,7 @@
</StackPanel>
</Design.PreviewWith>
<ControlTheme x:Key="{x:Type PathIcon}" TargetType="PathIcon">
<Setter Property="Foreground" Value="{DynamicResource ThemeForegroundColor}" />
Copy link
Member

Choose a reason for hiding this comment

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

ThemeForegroundColor doesn't exist in Fluent.

Also, we normally leave foreground empty in controls, so it can be inherited.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Switched to TextControlForeground

As for inheritance it doesn't work here for some reason

@avaloniaui-team
Copy link
Contributor

You can test this PR using the following package version. 11.0.999-cibuild0039222-beta. (feed url: https://nuget-feed-all.avaloniaui.net/v3/index.json) [PRBUILDID]

@avaloniaui-team
Copy link
Contributor

You can test this PR using the following package version. 11.0.999-cibuild0039234-beta. (feed url: https://nuget-feed-all.avaloniaui.net/v3/index.json) [PRBUILDID]

@avaloniaui-team
Copy link
Contributor

You can test this PR using the following package version. 11.0.999-cibuild0039361-beta. (feed url: https://nuget-feed-all.avaloniaui.net/v3/index.json) [PRBUILDID]

@maxkatz6 maxkatz6 added this pull request to the merge queue Sep 21, 2023
Merged via the queue into AvaloniaUI:master with commit cde9177 Sep 21, 2023
5 checks passed
@grokys grokys added the backport-candidate-11.0.x Consider this PR for backporting to 11.0 branch label Oct 2, 2023
grokys pushed a commit that referenced this pull request Oct 2, 2023
@wieslawsoltes @grokys
Restore PathIcon Foreground setter in Fluent theme (#12789)
5badacb 
* Restore PathIcon Foreground setter in Fluent theme

* Use TextControlForeground resource
@grokys grokys added backported-11.0.x and removed backport-candidate-11.0.x Consider this PR for backporting to 11.0 branch labels Oct 14, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@maxkatz6 maxkatz6 maxkatz6 approved these changes

Assignees
No one assigned
Labels
backported-11.0.x
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@wieslawsoltes @avaloniaui-team @maxkatz6 @grokys