Skip to content

[WIP] feat: Replace Generic.xaml resources with WinUI styles #21513

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

Draft
wants to merge 6 commits into
base: master
Choose a base branch
from
Draft

[WIP] feat: Replace Generic.xaml resources with WinUI styles #21513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
21b5ec0
feat: Replace Generic resources
MartinZikmund Sep 24, 2025
a13d313
chore: Missing value
MartinZikmund Sep 24, 2025
b054f55
chore: Remove invalid references
MartinZikmund Sep 24, 2025
920e761
feat: Add logging for invalid property value
MartinZikmund Sep 24, 2025
97455ff
fix: Adjust style references for `ScrollBar` and `ScrollViewer`
MartinZikmund Sep 24, 2025
361a026
fix: Workaround `SplitView` style
MartinZikmund Sep 24, 2025
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
2 changes: 1 addition & 1 deletion src/SourceGenerators/Uno.UI.SourceGenerators/XamlGenerator/XamlFileGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4848,7 +4848,7 @@ string GetMemberValue()
{
if (string.IsNullOrWhiteSpace(memberValue))
{
throw new InvalidOperationException($"The property value is invalid");
throw new InvalidOperationException($"The property value is invalid for {memberName} of type {propertyType?.Name}");
}

return memberValue!;
Expand Down
5 changes: 0 additions & 5 deletions src/Uno.UI/UI/Xaml/Controls/ScrollBar/ScrollBar.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1042,9 +1042,4 @@
</Setter>
</Style>

<macos:Style TargetType="ScrollBar" BasedOn="{StaticResource XamlNoAnimationScrollBar}" />
<netstdref:Style TargetType="ScrollBar" BasedOn="{StaticResource XamlNoAnimationScrollBar}" />
<ios:Style TargetType="ScrollBar" BasedOn="{StaticResource XamlDefaultScrollBar}" />
<android:Style TargetType="ScrollBar" BasedOn="{StaticResource XamlDefaultScrollBar}" />

</ResourceDictionary>
5 changes: 0 additions & 5 deletions src/Uno.UI/UI/Xaml/Controls/ScrollViewer/ScrollViewer.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,9 +326,4 @@
</Setter>
</Style>

<macos:Style TargetType="ScrollViewer" BasedOn="{StaticResource DefaultScrollViewerStyle}" />
<netstdref:Style TargetType="ScrollViewer" BasedOn="{StaticResource DefaultScrollViewerStyle}" />
<ios:Style TargetType="ScrollViewer" BasedOn="{StaticResource NativeScrollViewerStyle}" />
<android:Style TargetType="ScrollViewer" BasedOn="{StaticResource NativeScrollViewerStyle}" />

</ResourceDictionary>
91 changes: 0 additions & 91 deletions src/Uno.UI/UI/Xaml/Controls/TwoPaneView/TwoPaneView_rs1.xaml
View file
Open in desktop

This file was deleted.

130 changes: 0 additions & 130 deletions src/Uno.UI/UI/Xaml/Controls/TwoPaneView/TwoPaneView_v1.xaml
View file
Open in desktop

This file was deleted.

Loading
Loading