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

feat: Update ScrollBar to fluent styles on Skia #17358

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: Update ScrollBar to fluent styles on Skia #17358

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
6 changes: 3 additions & 3 deletions src/Uno.UI.FluentTheme.v2/Resources/Version2/PriorityDefault/ScrollBar_themeresources.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<ResourceDictionary
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:skia="http://uno.ui/skia"
xmlns:primitives="using:Microsoft.UI.Xaml.Controls.Primitives"
xmlns:contract7Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,7)"
xmlns:contract7NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,7)">
Expand Down Expand Up @@ -227,7 +227,7 @@
<!-- UNO TODO: Doesn't appear in ScrollViewer because default visual states are incompatible with Uno fixed-orientation optimizations
for performance. As of WinUI 2.5, seems visually very similar to previous ScrollBar template anyway. If this is restored, the
modifications made to the base UWP style on performance grounds should also be made here. -->
<win:Setter Property="Template">
<skia:Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="ScrollBar">
<Grid x:Name="Root">
Expand Down Expand Up @@ -806,6 +806,6 @@
</Grid>
</ControlTemplate>
</Setter.Value>
</win:Setter>
</skia:Setter>
</Style>
</ResourceDictionary>
4 changes: 2 additions & 2 deletions src/Uno.UI.FluentTheme.v2/themeresources_v2.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21239,7 +21239,7 @@
<!-- UNO TODO: Doesn't appear in ScrollViewer because default visual states are incompatible with Uno fixed-orientation optimizations
for performance. As of WinUI 2.5, seems visually very similar to previous ScrollBar template anyway. If this is restored, the
modifications made to the base UWP style on performance grounds should also be made here. -->
<win:Setter Property="Template">
<skia:Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="ScrollBar">
<Grid x:Name="Root">
Expand Down Expand Up @@ -21750,7 +21750,7 @@
</Grid>
</ControlTemplate>
</Setter.Value>
</win:Setter>
</skia:Setter>
</Style>
<Thickness x:Key="SliderTopHeaderMargin">0,0,0,4</Thickness>
<CornerRadius x:Key="SliderTrackCornerRadius">2</CornerRadius>
Expand Down
Loading