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

fix: properly override implicit styles for muxc controls #920

Merged
merged 1 commit into from
Aug 30, 2023
Merged

fix: properly override implicit styles for muxc controls #920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Uno.Gallery/Uno.Gallery.Shared/App.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
<!-- Load WinUI resources -->
<!-- Load these resources after the Material/Cupertino resources. This ensures that the default Fluent styles will be used as the implicit styles. -->
<XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
<ResourceDictionary Source="Views/Styles/FluentOverrides.xaml" />

<!-- Application's custom styles -->
<ResourceDictionary Source="Views/Colors.xaml" todo:note="define some colors\brushes, and images resources; not for color overriding" />
Expand Down
9 changes: 9 additions & 0 deletions Uno.Gallery/Uno.Gallery.Shared/Views/Styles/FluentOverrides.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:muxc="using:Microsoft.UI.Xaml.Controls">
<!-- uno issue: 13398 -->
<!-- This ensures that the default Fluent styles for these controls will be used as the implicit styles -->
<!-- The implicit Fluent styles here are not included in the XamlControlsResources res-dict -->
<Style TargetType="muxc:PipsPager" />
<Style TargetType="muxc:ProgressRing" />
<Style TargetType="muxc:ProgressBar" />
</ResourceDictionary>
Loading