From a6e202bdb23c9676b6a81394f646ca3bdcc848fb Mon Sep 17 00:00:00 2001
From: Martin Zikmund <martin@zikmund.dev>
Date: Mon, 1 Jul 2024 21:41:28 +0200
Subject: [PATCH] feat: Update ScrollBar to fluent styles on Skia

---
 .../Version2/PriorityDefault/ScrollBar_themeresources.xaml  | 6 +++---
 src/Uno.UI.FluentTheme.v2/themeresources_v2.xaml            | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Uno.UI.FluentTheme.v2/Resources/Version2/PriorityDefault/ScrollBar_themeresources.xaml b/src/Uno.UI.FluentTheme.v2/Resources/Version2/PriorityDefault/ScrollBar_themeresources.xaml
index 287768c1b784..044bd251492d 100644
--- a/src/Uno.UI.FluentTheme.v2/Resources/Version2/PriorityDefault/ScrollBar_themeresources.xaml
+++ b/src/Uno.UI.FluentTheme.v2/Resources/Version2/PriorityDefault/ScrollBar_themeresources.xaml
@@ -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)">
@@ -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">
@@ -806,6 +806,6 @@
                     </Grid>
                 </ControlTemplate>
             </Setter.Value>
-        </win:Setter>
+        </skia:Setter>
     </Style>
 </ResourceDictionary>
diff --git a/src/Uno.UI.FluentTheme.v2/themeresources_v2.xaml b/src/Uno.UI.FluentTheme.v2/themeresources_v2.xaml
index 9567862bd575..e093b50240eb 100644
--- a/src/Uno.UI.FluentTheme.v2/themeresources_v2.xaml
+++ b/src/Uno.UI.FluentTheme.v2/themeresources_v2.xaml
@@ -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">
@@ -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>