From 4acb20dcd0f6a241b65cdd94ec4dfaea5ce50b25 Mon Sep 17 00:00:00 2001
From: Yimeng Wu <me@kinnara.cn>
Date: Fri, 17 Nov 2023 23:52:15 +0000
Subject: [PATCH] Port microsoft/microsoft-ui-xaml#4541 (#614)

---
 .../Styles/Controls.FlipView.xaml             | 49 +++++++++++++------
 ModernWpf/ThemeResources/Dark.xaml            |  6 +--
 ModernWpf/ThemeResources/HighContrast.xaml    |  6 +--
 ModernWpf/ThemeResources/Light.xaml           |  6 +--
 4 files changed, 42 insertions(+), 25 deletions(-)

diff --git a/ModernWpf.MahApps/Styles/Controls.FlipView.xaml b/ModernWpf.MahApps/Styles/Controls.FlipView.xaml
index d1750b92..1a617237 100644
--- a/ModernWpf.MahApps/Styles/Controls.FlipView.xaml
+++ b/ModernWpf.MahApps/Styles/Controls.FlipView.xaml
@@ -1,9 +1,14 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:sys="clr-namespace:System;assembly=mscorlib"
     xmlns:ui="http://schemas.modernwpf.com/2019"
     xmlns:Controls="http://metro.mahapps.com/winfx/xaml/controls">
 
+    <sys:Double x:Key="FlipViewButtonFontSize">8</sys:Double>
+    <sys:Double x:Key="FlipViewButtonFontSizePointerOver">9</sys:Double>
+    <sys:Double x:Key="FlipViewButtonFontSizePressed">7</sys:Double>
+
     <Style x:Key="DefaultFlipViewStyle" TargetType="Controls:FlipView">
         <Setter Property="Background" Value="{DynamicResource FlipViewBackground}" />
         <Setter Property="BorderThickness" Value="0" />
@@ -71,7 +76,7 @@
                                         <ui:FontIconFallback
                                             x:Name="Arrow"
                                             FontFamily="{DynamicResource SymbolThemeFontFamily}"
-                                            FontSize="12"
+                                            FontSize="{DynamicResource FlipViewButtonFontSize}"
                                             Foreground="{DynamicResource FlipViewNextPreviousArrowForeground}"
                                             Data="{StaticResource CaretRight}"
                                             HorizontalAlignment="Center"
@@ -83,11 +88,13 @@
                                             <Setter TargetName="Root" Property="Background" Value="{DynamicResource FlipViewNextPreviousButtonBackgroundPointerOver}" />
                                             <Setter TargetName="Root" Property="BorderBrush" Value="{DynamicResource FlipViewNextPreviousButtonBorderBrushPointerOver}" />
                                             <Setter TargetName="Arrow" Property="Foreground" Value="{DynamicResource FlipViewNextPreviousArrowForegroundPointerOver}" />
+                                            <Setter TargetName="Arrow" Property="FontSize" Value="{StaticResource FlipViewButtonFontSizePointerOver}" />
                                         </Trigger>
                                         <Trigger Property="IsPressed" Value="True">
                                             <Setter TargetName="Root" Property="Background" Value="{DynamicResource FlipViewNextPreviousButtonBackgroundPressed}" />
                                             <Setter TargetName="Root" Property="BorderBrush" Value="{DynamicResource FlipViewNextPreviousButtonBorderBrushPressed}" />
                                             <Setter TargetName="Arrow" Property="Foreground" Value="{DynamicResource FlipViewNextPreviousArrowForegroundPressed}" />
+                                            <Setter TargetName="Arrow" Property="FontSize" Value="{StaticResource FlipViewButtonFontSizePressed}" />
                                         </Trigger>
                                     </ControlTemplate.Triggers>
                                 </ControlTemplate>
@@ -101,7 +108,7 @@
                                         <ui:FontIconFallback
                                             x:Name="Arrow"
                                             FontFamily="{DynamicResource SymbolThemeFontFamily}"
-                                            FontSize="12"
+                                            FontSize="{DynamicResource FlipViewButtonFontSize}"
                                             Foreground="{DynamicResource FlipViewNextPreviousArrowForeground}"
                                             Data="{StaticResource CaretLeft}"
                                             HorizontalAlignment="Center"
@@ -113,11 +120,13 @@
                                             <Setter TargetName="Root" Property="Background" Value="{DynamicResource FlipViewNextPreviousButtonBackgroundPointerOver}" />
                                             <Setter TargetName="Root" Property="BorderBrush" Value="{DynamicResource FlipViewNextPreviousButtonBorderBrushPointerOver}" />
                                             <Setter TargetName="Arrow" Property="Foreground" Value="{DynamicResource FlipViewNextPreviousArrowForegroundPointerOver}" />
+                                            <Setter TargetName="Arrow" Property="FontSize" Value="{StaticResource FlipViewButtonFontSizePointerOver}" />
                                         </Trigger>
                                         <Trigger Property="IsPressed" Value="True">
                                             <Setter TargetName="Root" Property="Background" Value="{DynamicResource FlipViewNextPreviousButtonBackgroundPressed}" />
                                             <Setter TargetName="Root" Property="BorderBrush" Value="{DynamicResource FlipViewNextPreviousButtonBorderBrushPressed}" />
                                             <Setter TargetName="Arrow" Property="Foreground" Value="{DynamicResource FlipViewNextPreviousArrowForegroundPressed}" />
+                                            <Setter TargetName="Arrow" Property="FontSize" Value="{StaticResource FlipViewButtonFontSizePressed}" />
                                         </Trigger>
                                     </ControlTemplate.Triggers>
                                 </ControlTemplate>
@@ -131,7 +140,7 @@
                                         <ui:FontIconFallback
                                             x:Name="Arrow"
                                             FontFamily="{DynamicResource SymbolThemeFontFamily}"
-                                            FontSize="12"
+                                            FontSize="{DynamicResource FlipViewButtonFontSize}"
                                             Foreground="{DynamicResource FlipViewNextPreviousArrowForeground}"
                                             Data="{StaticResource CaretDown}"
                                             HorizontalAlignment="Center"
@@ -143,11 +152,13 @@
                                             <Setter TargetName="Root" Property="Background" Value="{DynamicResource FlipViewNextPreviousButtonBackgroundPointerOver}" />
                                             <Setter TargetName="Root" Property="BorderBrush" Value="{DynamicResource FlipViewNextPreviousButtonBorderBrushPointerOver}" />
                                             <Setter TargetName="Arrow" Property="Foreground" Value="{DynamicResource FlipViewNextPreviousArrowForegroundPointerOver}" />
+                                            <Setter TargetName="Arrow" Property="FontSize" Value="{StaticResource FlipViewButtonFontSizePointerOver}" />
                                         </Trigger>
                                         <Trigger Property="IsPressed" Value="True">
                                             <Setter TargetName="Root" Property="Background" Value="{DynamicResource FlipViewNextPreviousButtonBackgroundPressed}" />
                                             <Setter TargetName="Root" Property="BorderBrush" Value="{DynamicResource FlipViewNextPreviousButtonBorderBrushPressed}" />
                                             <Setter TargetName="Arrow" Property="Foreground" Value="{DynamicResource FlipViewNextPreviousArrowForegroundPressed}" />
+                                            <Setter TargetName="Arrow" Property="FontSize" Value="{StaticResource FlipViewButtonFontSizePressed}" />
                                         </Trigger>
                                     </ControlTemplate.Triggers>
                                 </ControlTemplate>
@@ -161,7 +172,7 @@
                                         <ui:FontIconFallback
                                             x:Name="Arrow"
                                             FontFamily="{DynamicResource SymbolThemeFontFamily}"
-                                            FontSize="12"
+                                            FontSize="{DynamicResource FlipViewButtonFontSize}"
                                             Foreground="{DynamicResource FlipViewNextPreviousArrowForeground}"
                                             Data="{StaticResource CaretUp}"
                                             HorizontalAlignment="Center"
@@ -173,11 +184,13 @@
                                             <Setter TargetName="Root" Property="Background" Value="{DynamicResource FlipViewNextPreviousButtonBackgroundPointerOver}" />
                                             <Setter TargetName="Root" Property="BorderBrush" Value="{DynamicResource FlipViewNextPreviousButtonBorderBrushPointerOver}" />
                                             <Setter TargetName="Arrow" Property="Foreground" Value="{DynamicResource FlipViewNextPreviousArrowForegroundPointerOver}" />
+                                            <Setter TargetName="Arrow" Property="FontSize" Value="{StaticResource FlipViewButtonFontSizePointerOver}" />
                                         </Trigger>
                                         <Trigger Property="IsPressed" Value="True">
                                             <Setter TargetName="Root" Property="Background" Value="{DynamicResource FlipViewNextPreviousButtonBackgroundPressed}" />
                                             <Setter TargetName="Root" Property="BorderBrush" Value="{DynamicResource FlipViewNextPreviousButtonBorderBrushPressed}" />
                                             <Setter TargetName="Arrow" Property="Foreground" Value="{DynamicResource FlipViewNextPreviousArrowForegroundPressed}" />
+                                            <Setter TargetName="Arrow" Property="FontSize" Value="{StaticResource FlipViewButtonFontSizePressed}" />
                                         </Trigger>
                                     </ControlTemplate.Triggers>
                                 </ControlTemplate>
@@ -193,9 +206,10 @@
                             <Button
                                 x:Name="PART_BackButton"
                                 Template="{StaticResource HorizontalPreviousTemplate}"
-                                Width="20"
-                                Height="36"
-                                ui:ControlHelper.CornerRadius="{TemplateBinding ui:ControlHelper.CornerRadius, Converter={StaticResource RightCornerRadiusFilterConverter}}"
+                                Width="16"
+                                Height="38"
+                                Margin="1"
+                                ui:ControlHelper.CornerRadius="{TemplateBinding ui:ControlHelper.CornerRadius}"
                                 IsTabStop="False"
                                 FocusVisualStyle="{x:Null}"
                                 HorizontalAlignment="Left"
@@ -204,9 +218,10 @@
                             <Button
                                 x:Name="PART_ForwardButton"
                                 Template="{StaticResource HorizontalNextTemplate}"
-                                Width="20"
-                                Height="36"
-                                ui:ControlHelper.CornerRadius="{TemplateBinding ui:ControlHelper.CornerRadius, Converter={StaticResource LeftCornerRadiusFilterConverter}}"
+                                Width="16"
+                                Height="38"
+                                Margin="1"
+                                ui:ControlHelper.CornerRadius="{TemplateBinding ui:ControlHelper.CornerRadius}"
                                 IsTabStop="False"
                                 FocusVisualStyle="{x:Null}"
                                 HorizontalAlignment="Right"
@@ -215,9 +230,10 @@
                             <Button
                                 x:Name="PART_UpButton"
                                 Template="{StaticResource VerticalPreviousTemplate}"
-                                Width="36"
-                                Height="20"
-                                ui:ControlHelper.CornerRadius="{TemplateBinding ui:ControlHelper.CornerRadius, Converter={StaticResource BottomCornerRadiusFilterConverter}}"
+                                Width="38"
+                                Height="16"
+                                Margin="1"
+                                ui:ControlHelper.CornerRadius="{TemplateBinding ui:ControlHelper.CornerRadius}"
                                 IsTabStop="False"
                                 FocusVisualStyle="{x:Null}"
                                 HorizontalAlignment="Center"
@@ -226,9 +242,10 @@
                             <Button
                                 x:Name="PART_DownButton"
                                 Template="{StaticResource VerticalNextTemplate}"
-                                Width="36"
-                                Height="20"
-                                ui:ControlHelper.CornerRadius="{TemplateBinding ui:ControlHelper.CornerRadius, Converter={StaticResource TopCornerRadiusFilterConverter}}"
+                                Width="38"
+                                Height="16"
+                                Margin="1"
+                                ui:ControlHelper.CornerRadius="{TemplateBinding ui:ControlHelper.CornerRadius}"
                                 IsTabStop="False"
                                 FocusVisualStyle="{x:Null}"
                                 HorizontalAlignment="Center"
diff --git a/ModernWpf/ThemeResources/Dark.xaml b/ModernWpf/ThemeResources/Dark.xaml
index a38db942..eb3f4436 100644
--- a/ModernWpf/ThemeResources/Dark.xaml
+++ b/ModernWpf/ThemeResources/Dark.xaml
@@ -913,9 +913,9 @@
     <!-- Resources for FlipView -->
     <Thickness x:Key="FlipViewButtonBorderThemeThickness">0</Thickness>
     <m:StaticResource x:Key="FlipViewBackground" ResourceKey="SolidBackgroundFillColorBaseBrush" />
-    <m:StaticResource x:Key="FlipViewNextPreviousButtonBackground" ResourceKey="ControlAltFillColorQuarternaryBrush" />
-    <m:StaticResource x:Key="FlipViewNextPreviousButtonBackgroundPointerOver" ResourceKey="ControlStrokeColorDefaultBrush" />
-    <m:StaticResource x:Key="FlipViewNextPreviousButtonBackgroundPressed" ResourceKey="ControlAAStrokeColorDefaultBrush" />
+    <m:StaticResource x:Key="FlipViewNextPreviousButtonBackground" ResourceKey="AcrylicInAppFillColorDefaultBrush" />
+    <m:StaticResource x:Key="FlipViewNextPreviousButtonBackgroundPointerOver" ResourceKey="AcrylicInAppFillColorDefaultBrush" />
+    <m:StaticResource x:Key="FlipViewNextPreviousButtonBackgroundPressed" ResourceKey="AcrylicInAppFillColorDefaultBrush" />
     <m:StaticResource x:Key="FlipViewNextPreviousArrowForeground" ResourceKey="ControlAAFillColorDefaultBrush" />
     <m:StaticResource x:Key="FlipViewNextPreviousArrowForegroundPointerOver" ResourceKey="TextFillColorSecondaryBrush" />
     <m:StaticResource x:Key="FlipViewNextPreviousArrowForegroundPressed" ResourceKey="TextFillColorSecondaryBrush" />
diff --git a/ModernWpf/ThemeResources/HighContrast.xaml b/ModernWpf/ThemeResources/HighContrast.xaml
index ad7cfb0a..719f497e 100644
--- a/ModernWpf/ThemeResources/HighContrast.xaml
+++ b/ModernWpf/ThemeResources/HighContrast.xaml
@@ -800,9 +800,9 @@
     <!-- Resources for FlipView -->
     <Thickness x:Key="FlipViewButtonBorderThemeThickness">0</Thickness>
     <m:StaticResource x:Key="FlipViewBackground" ResourceKey="SystemControlPageBackgroundListLowBrush" />
-    <m:StaticResource x:Key="FlipViewNextPreviousButtonBackground" ResourceKey="SystemControlBackgroundBaseMediumLowBrush" />
-    <m:StaticResource x:Key="FlipViewNextPreviousButtonBackgroundPointerOver" ResourceKey="SystemControlHighlightBaseMediumBrush" />
-    <m:StaticResource x:Key="FlipViewNextPreviousButtonBackgroundPressed" ResourceKey="SystemControlHighlightBaseMediumHighBrush" />
+    <m:StaticResource x:Key="FlipViewNextPreviousButtonBackground" ResourceKey="AcrylicInAppFillColorDefaultBrush" />
+    <m:StaticResource x:Key="FlipViewNextPreviousButtonBackgroundPointerOver" ResourceKey="AcrylicInAppFillColorDefaultBrush" />
+    <m:StaticResource x:Key="FlipViewNextPreviousButtonBackgroundPressed" ResourceKey="AcrylicInAppFillColorDefaultBrush" />
     <m:StaticResource x:Key="FlipViewNextPreviousArrowForeground" ResourceKey="SystemControlForegroundAltMediumHighBrush" />
     <m:StaticResource x:Key="FlipViewNextPreviousArrowForegroundPointerOver" ResourceKey="SystemControlHighlightAltAltMediumHighBrush" />
     <m:StaticResource x:Key="FlipViewNextPreviousArrowForegroundPressed" ResourceKey="SystemControlHighlightAltAltMediumHighBrush" />
diff --git a/ModernWpf/ThemeResources/Light.xaml b/ModernWpf/ThemeResources/Light.xaml
index a28ab444..504de311 100644
--- a/ModernWpf/ThemeResources/Light.xaml
+++ b/ModernWpf/ThemeResources/Light.xaml
@@ -916,9 +916,9 @@
     <!-- Resources for FlipView -->
     <Thickness x:Key="FlipViewButtonBorderThemeThickness">0</Thickness>
     <m:StaticResource x:Key="FlipViewBackground" ResourceKey="SolidBackgroundFillColorBaseBrush" />
-    <m:StaticResource x:Key="FlipViewNextPreviousButtonBackground" ResourceKey="ControlAltFillColorQuarternaryBrush" />
-    <m:StaticResource x:Key="FlipViewNextPreviousButtonBackgroundPointerOver" ResourceKey="ControlStrokeColorDefaultBrush" />
-    <m:StaticResource x:Key="FlipViewNextPreviousButtonBackgroundPressed" ResourceKey="ControlAAStrokeColorDefaultBrush" />
+    <m:StaticResource x:Key="FlipViewNextPreviousButtonBackground" ResourceKey="AcrylicInAppFillColorDefaultBrush" />
+    <m:StaticResource x:Key="FlipViewNextPreviousButtonBackgroundPointerOver" ResourceKey="AcrylicInAppFillColorDefaultBrush" />
+    <m:StaticResource x:Key="FlipViewNextPreviousButtonBackgroundPressed" ResourceKey="AcrylicInAppFillColorDefaultBrush" />
     <m:StaticResource x:Key="FlipViewNextPreviousArrowForeground" ResourceKey="ControlAAFillColorDefaultBrush" />
     <m:StaticResource x:Key="FlipViewNextPreviousArrowForegroundPointerOver" ResourceKey="TextFillColorSecondaryBrush" />
     <m:StaticResource x:Key="FlipViewNextPreviousArrowForegroundPressed" ResourceKey="TextFillColorSecondaryBrush" />