From aa934c81f6f613935683615e25073ed45af93a93 Mon Sep 17 00:00:00 2001
From: Jumar Macato <hikari.netto23@gmail.com>
Date: Thu, 28 May 2020 11:39:59 +0800
Subject: [PATCH 01/45] Porting resources

---
 .../Accents/FluentBaseDark.xaml               | 28 +++++++++-
 .../Accents/FluentBaseLight.xaml              | 28 +++++++++-
 .../Accents/FluentControlResourcesDark.xaml   | 55 ++++++++++++++++++-
 .../Accents/FluentControlResourcesLight.xaml  | 55 ++++++++++++++++++-
 4 files changed, 154 insertions(+), 12 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Accents/FluentBaseDark.xaml b/src/Avalonia.Themes.Fluent/Accents/FluentBaseDark.xaml
index 292870c3cf..e8e4c96786 100644
--- a/src/Avalonia.Themes.Fluent/Accents/FluentBaseDark.xaml
+++ b/src/Avalonia.Themes.Fluent/Accents/FluentBaseDark.xaml
@@ -1,6 +1,6 @@
-<Style xmlns="https://github.com/avaloniaui"
-       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-       xmlns:sys="clr-namespace:System;assembly=netstandard">
+<Style xmlns="https://github.com/avaloniaui" 
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
+  xmlns:sys="clr-namespace:System;assembly=netstandard">
   <Style.Resources>
     <Color x:Key="SystemAccentColor">#FF0078D7</Color>
     <Color x:Key="SystemAltHighColor">#FF000000</Color>
@@ -208,5 +208,27 @@
     <StaticResource x:Key="CheckBoxCheckGlyphForegroundIndeterminatePointerOver" ResourceKey="SystemControlForegroundBaseHighBrush" />
     <StaticResource x:Key="CheckBoxCheckGlyphForegroundIndeterminatePressed" ResourceKey="SystemControlForegroundBaseMediumBrush" />
     <StaticResource x:Key="CheckBoxCheckGlyphForegroundIndeterminateDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <!-- BaseResources for Slider.xaml -->
+    <StaticResource x:Key="SliderContainerBackground" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="SliderContainerBackgroundPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="SliderContainerBackgroundPressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="SliderContainerBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="SliderThumbBackground" ResourceKey="SystemControlForegroundAccentBrush" />
+    <StaticResource x:Key="SliderThumbBackgroundPointerOver" ResourceKey="SystemControlHighlightChromeAltLowBrush" />
+    <StaticResource x:Key="SliderThumbBackgroundPressed" ResourceKey="SystemControlHighlightChromeHighBrush" />
+    <StaticResource x:Key="SliderThumbBackgroundDisabled" ResourceKey="SystemControlDisabledChromeDisabledHighBrush" />
+    <StaticResource x:Key="SliderTrackFill" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
+    <StaticResource x:Key="SliderTrackFillPointerOver" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <StaticResource x:Key="SliderTrackFillPressed" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
+    <StaticResource x:Key="SliderTrackFillDisabled" ResourceKey="SystemControlDisabledChromeDisabledHighBrush" />
+    <StaticResource x:Key="SliderTrackValueFill" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="SliderTrackValueFillPointerOver" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="SliderTrackValueFillPressed" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="SliderTrackValueFillDisabled" ResourceKey="SystemControlDisabledChromeDisabledHighBrush" />
+    <StaticResource x:Key="SliderHeaderForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="SliderHeaderForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="SliderTickBarFill" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
+    <StaticResource x:Key="SliderTickBarFillDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="SliderInlineTickBarFill" ResourceKey="SystemControlBackgroundAltHighBrush" />
   </Style.Resources>
 </Style>
diff --git a/src/Avalonia.Themes.Fluent/Accents/FluentBaseLight.xaml b/src/Avalonia.Themes.Fluent/Accents/FluentBaseLight.xaml
index f734e1eff8..b693df38f4 100644
--- a/src/Avalonia.Themes.Fluent/Accents/FluentBaseLight.xaml
+++ b/src/Avalonia.Themes.Fluent/Accents/FluentBaseLight.xaml
@@ -1,6 +1,6 @@
-<Style xmlns="https://github.com/avaloniaui"
-       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-       xmlns:sys="clr-namespace:System;assembly=netstandard">
+<Style xmlns="https://github.com/avaloniaui" 
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
+  xmlns:sys="clr-namespace:System;assembly=netstandard">
   <Style.Resources>
     <Color x:Key="SystemAccentColor">#FF0078D7</Color>
     <Color x:Key="SystemAltHighColor">#FFFFFFFF</Color>
@@ -209,5 +209,27 @@
     <StaticResource x:Key="CheckBoxCheckGlyphForegroundIndeterminatePointerOver" ResourceKey="SystemControlForegroundBaseHighBrush" />
     <StaticResource x:Key="CheckBoxCheckGlyphForegroundIndeterminatePressed" ResourceKey="SystemControlForegroundBaseMediumBrush" />
     <StaticResource x:Key="CheckBoxCheckGlyphForegroundIndeterminateDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <!-- BaseResources for Slider.xaml -->
+    <StaticResource x:Key="SliderContainerBackground" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="SliderContainerBackgroundPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="SliderContainerBackgroundPressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="SliderContainerBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="SliderThumbBackground" ResourceKey="SystemControlForegroundAccentBrush" />
+    <StaticResource x:Key="SliderThumbBackgroundPointerOver" ResourceKey="SystemControlHighlightChromeAltLowBrush" />
+    <StaticResource x:Key="SliderThumbBackgroundPressed" ResourceKey="SystemControlHighlightChromeHighBrush" />
+    <StaticResource x:Key="SliderThumbBackgroundDisabled" ResourceKey="SystemControlDisabledChromeDisabledHighBrush" />
+    <StaticResource x:Key="SliderTrackFill" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
+    <StaticResource x:Key="SliderTrackFillPointerOver" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <StaticResource x:Key="SliderTrackFillPressed" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
+    <StaticResource x:Key="SliderTrackFillDisabled" ResourceKey="SystemControlDisabledChromeDisabledHighBrush" />
+    <StaticResource x:Key="SliderTrackValueFill" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="SliderTrackValueFillPointerOver" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="SliderTrackValueFillPressed" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="SliderTrackValueFillDisabled" ResourceKey="SystemControlDisabledChromeDisabledHighBrush" />
+    <StaticResource x:Key="SliderHeaderForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="SliderHeaderForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="SliderTickBarFill" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
+    <StaticResource x:Key="SliderTickBarFillDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="SliderInlineTickBarFill" ResourceKey="SystemControlBackgroundAltHighBrush" />
   </Style.Resources>
 </Style>
diff --git a/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesDark.xaml b/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesDark.xaml
index 3f9dc68383..1de481b40b 100644
--- a/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesDark.xaml
+++ b/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesDark.xaml
@@ -1,6 +1,6 @@
-<Style xmlns="https://github.com/avaloniaui"
-       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-       xmlns:sys="clr-namespace:System;assembly=netstandard">
+<Style xmlns="https://github.com/avaloniaui" 
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
+  xmlns:sys="clr-namespace:System;assembly=netstandard">
   <Style.Resources>
     <!-- Resources for Button.xaml -->
     <StaticResource x:Key="AccentButtonBackground" ResourceKey="SystemControlBackgroundAccentBrush" />
@@ -171,5 +171,54 @@
     <SolidColorBrush x:Key="CheckBoxPressedBackgroundThemeBrush" Color="#FFFFFFFF" />
     <SolidColorBrush x:Key="CheckBoxPressedBorderThemeBrush" Color="#FFFFFFFF" />
     <SolidColorBrush x:Key="CheckBoxPressedForegroundThemeBrush" Color="#FF000000" />
+    <!-- Resources for Slider.xaml -->
+    <x:Double x:Key="SliderOutsideTickBarThemeHeight">4</x:Double>
+    <x:Double x:Key="SliderTrackThemeHeight">2</x:Double>
+    <Thickness x:Key="SliderBorderThemeThickness">0</Thickness>
+    <Thickness x:Key="SliderHeaderThemeMargin">0,0,0,4</Thickness>
+    <FontWeight x:Key="SliderHeaderThemeFontWeight">Normal</FontWeight>
+    <StaticResource x:Key="SliderContainerBackground" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="SliderContainerBackgroundPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="SliderContainerBackgroundPressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="SliderContainerBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="SliderThumbBackground" ResourceKey="SystemControlForegroundAccentBrush" />
+    <StaticResource x:Key="SliderThumbBackgroundPointerOver" ResourceKey="SystemAccentColorLight1" />
+    <StaticResource x:Key="SliderThumbBackgroundPressed" ResourceKey="SystemAccentColorDark1" />
+    <StaticResource x:Key="SliderThumbBackgroundDisabled" ResourceKey="SystemControlDisabledChromeDisabledHighBrush" />
+    <StaticResource x:Key="SliderTrackFill" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
+    <StaticResource x:Key="SliderTrackFillPointerOver" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <StaticResource x:Key="SliderTrackFillPressed" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
+    <StaticResource x:Key="SliderTrackFillDisabled" ResourceKey="SystemControlDisabledChromeDisabledHighBrush" />
+    <StaticResource x:Key="SliderTrackValueFill" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="SliderTrackValueFillPointerOver" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="SliderTrackValueFillPressed" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="SliderTrackValueFillDisabled" ResourceKey="SystemControlDisabledChromeDisabledHighBrush" />
+    <StaticResource x:Key="SliderHeaderForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="SliderHeaderForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="SliderTickBarFill" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
+    <StaticResource x:Key="SliderTickBarFillDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="SliderInlineTickBarFill" ResourceKey="SystemControlBackgroundAltHighBrush" />
+    <SolidColorBrush x:Key="SliderBorderThemeBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="SliderDisabledBorderThemeBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="SliderThumbBackgroundThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="SliderThumbBorderThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="SliderThumbDisabledBackgroundThemeBrush" Color="#FF7E7E7E" />
+    <SolidColorBrush x:Key="SliderThumbPointerOverBackgroundThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="SliderThumbPointerOverBorderThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="SliderThumbPressedBackgroundThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="SliderThumbPressedBorderThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="SliderTickMarkInlineBackgroundThemeBrush" Color="Black" />
+    <SolidColorBrush x:Key="SliderTickMarkInlineDisabledForegroundThemeBrush" Color="Black" />
+    <SolidColorBrush x:Key="SliderTickmarkOutsideBackgroundThemeBrush" Color="#80FFFFFF" />
+    <SolidColorBrush x:Key="SliderTickMarkOutsideDisabledForegroundThemeBrush" Color="#80FFFFFF" />
+    <SolidColorBrush x:Key="SliderTrackBackgroundThemeBrush" Color="#29FFFFFF" />
+    <SolidColorBrush x:Key="SliderTrackDecreaseBackgroundThemeBrush" Color="#FF5B2EC5" />
+    <SolidColorBrush x:Key="SliderTrackDecreaseDisabledBackgroundThemeBrush" Color="#1FFFFFFF" />
+    <SolidColorBrush x:Key="SliderTrackDecreasePointerOverBackgroundThemeBrush" Color="#FF724BCD" />
+    <SolidColorBrush x:Key="SliderTrackDecreasePressedBackgroundThemeBrush" Color="#FF8152EF" />
+    <SolidColorBrush x:Key="SliderTrackDisabledBackgroundThemeBrush" Color="#29FFFFFF" />
+    <SolidColorBrush x:Key="SliderTrackPointerOverBackgroundThemeBrush" Color="#46FFFFFF" />
+    <SolidColorBrush x:Key="SliderTrackPressedBackgroundThemeBrush" Color="#59FFFFFF" />
+    <SolidColorBrush x:Key="SliderHeaderForegroundThemeBrush" Color="#FFFFFFFF" />
   </Style.Resources>
 </Style>
diff --git a/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesLight.xaml b/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesLight.xaml
index 46b8f4422c..1b755c133d 100644
--- a/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesLight.xaml
+++ b/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesLight.xaml
@@ -1,6 +1,6 @@
-<Style xmlns="https://github.com/avaloniaui"
-       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-       xmlns:sys="clr-namespace:System;assembly=netstandard">
+<Style xmlns="https://github.com/avaloniaui" 
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
+  xmlns:sys="clr-namespace:System;assembly=netstandard">
   <Style.Resources>
     <!-- Resources for Button.xaml -->
     <StaticResource x:Key="AccentButtonBackground" ResourceKey="SystemControlBackgroundAccentBrush" />
@@ -171,5 +171,54 @@
     <SolidColorBrush x:Key="CheckBoxPressedBackgroundThemeBrush" Color="#FF000000" />
     <SolidColorBrush x:Key="CheckBoxPressedBorderThemeBrush" Color="#FF000000" />
     <SolidColorBrush x:Key="CheckBoxPressedForegroundThemeBrush" Color="#FFFFFFFF" />
+    <!-- Resources for Slider.xaml -->
+    <x:Double x:Key="SliderOutsideTickBarThemeHeight">4</x:Double>
+    <x:Double x:Key="SliderTrackThemeHeight">2</x:Double>
+    <Thickness x:Key="SliderBorderThemeThickness">0</Thickness>
+    <Thickness x:Key="SliderHeaderThemeMargin">0,0,0,4</Thickness>
+    <FontWeight x:Key="SliderHeaderThemeFontWeight">Normal</FontWeight>
+    <StaticResource x:Key="SliderContainerBackground" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="SliderContainerBackgroundPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="SliderContainerBackgroundPressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="SliderContainerBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="SliderThumbBackground" ResourceKey="SystemControlForegroundAccentBrush" />
+    <StaticResource x:Key="SliderThumbBackgroundPointerOver" ResourceKey="SystemAccentColorLight1" />
+    <StaticResource x:Key="SliderThumbBackgroundPressed" ResourceKey="SystemAccentColorDark1" />
+    <StaticResource x:Key="SliderThumbBackgroundDisabled" ResourceKey="SystemControlDisabledChromeDisabledHighBrush" />
+    <StaticResource x:Key="SliderTrackFill" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
+    <StaticResource x:Key="SliderTrackFillPointerOver" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <StaticResource x:Key="SliderTrackFillPressed" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
+    <StaticResource x:Key="SliderTrackFillDisabled" ResourceKey="SystemControlDisabledChromeDisabledHighBrush" />
+    <StaticResource x:Key="SliderTrackValueFill" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="SliderTrackValueFillPointerOver" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="SliderTrackValueFillPressed" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="SliderTrackValueFillDisabled" ResourceKey="SystemControlDisabledChromeDisabledHighBrush" />
+    <StaticResource x:Key="SliderHeaderForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="SliderHeaderForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="SliderTickBarFill" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
+    <StaticResource x:Key="SliderTickBarFillDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="SliderInlineTickBarFill" ResourceKey="SystemControlBackgroundAltHighBrush" />
+    <SolidColorBrush x:Key="SliderBorderThemeBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="SliderDisabledBorderThemeBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="SliderThumbBackgroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="SliderThumbBorderThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="SliderThumbDisabledBackgroundThemeBrush" Color="#FF929292" />
+    <SolidColorBrush x:Key="SliderThumbPointerOverBackgroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="SliderThumbPointerOverBorderThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="SliderThumbPressedBackgroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="SliderThumbPressedBorderThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="SliderTickMarkInlineBackgroundThemeBrush" Color="White" />
+    <SolidColorBrush x:Key="SliderTickMarkInlineDisabledForegroundThemeBrush" Color="White" />
+    <SolidColorBrush x:Key="SliderTickmarkOutsideBackgroundThemeBrush" Color="#80000000" />
+    <SolidColorBrush x:Key="SliderTickMarkOutsideDisabledForegroundThemeBrush" Color="#80000000" />
+    <SolidColorBrush x:Key="SliderTrackBackgroundThemeBrush" Color="#1A000000" />
+    <SolidColorBrush x:Key="SliderTrackDecreaseBackgroundThemeBrush" Color="#FF4617B4" />
+    <SolidColorBrush x:Key="SliderTrackDecreaseDisabledBackgroundThemeBrush" Color="#1C000000" />
+    <SolidColorBrush x:Key="SliderTrackDecreasePointerOverBackgroundThemeBrush" Color="#FF5F37BE" />
+    <SolidColorBrush x:Key="SliderTrackDecreasePressedBackgroundThemeBrush" Color="#FF7241E4" />
+    <SolidColorBrush x:Key="SliderTrackDisabledBackgroundThemeBrush" Color="#1A000000" />
+    <SolidColorBrush x:Key="SliderTrackPointerOverBackgroundThemeBrush" Color="#26000000" />
+    <SolidColorBrush x:Key="SliderTrackPressedBackgroundThemeBrush" Color="#33000000" />
+    <SolidColorBrush x:Key="SliderHeaderForegroundThemeBrush" Color="#FF000000" />
   </Style.Resources>
 </Style>

From cbc94cd708662b603572a91dcd639cbbf050235d Mon Sep 17 00:00:00 2001
From: Jumar Macato <hikari.netto23@gmail.com>
Date: Thu, 28 May 2020 12:04:45 +0800
Subject: [PATCH 02/45] WIP

---
 src/Avalonia.Themes.Default/Slider.xaml | 329 ++++++++++++++++++------
 1 file changed, 246 insertions(+), 83 deletions(-)

diff --git a/src/Avalonia.Themes.Default/Slider.xaml b/src/Avalonia.Themes.Default/Slider.xaml
index b21cbf3650..f9857be906 100644
--- a/src/Avalonia.Themes.Default/Slider.xaml
+++ b/src/Avalonia.Themes.Default/Slider.xaml
@@ -1,93 +1,256 @@
-<Styles xmlns="https://github.com/avaloniaui">
-  <Style Selector="Slider:horizontal">
-    <Setter Property="MinWidth" Value="40"/>
-    <Setter Property="MinHeight" Value="20"/>
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Grid Name="grid">
-          <Grid.RowDefinitions>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="Auto" MinHeight="20"/>
-            <RowDefinition Height="Auto"/>
-          </Grid.RowDefinitions>
-          <Border Name="TrackBackground" Grid.Row="1" Height="4" Margin="6,0" VerticalAlignment="Center"/>
-          <Track Name="PART_Track" Grid.Row="1" Orientation="Horizontal">
-            <Track.DecreaseButton>
-               <RepeatButton Name="PART_DecreaseButton"
-                             Classes="repeattrack" />
-            </Track.DecreaseButton>
-            <Track.IncreaseButton>
-               <RepeatButton Name="PART_IncreaseButton"
-                             Classes="repeattrack" />
-            </Track.IncreaseButton>
-            <Thumb Name="thumb" MinWidth="20" MinHeight="20">
-              <Thumb.Template>
-                <ControlTemplate>
-                  <Grid>
-                    <Ellipse Width="12" Height="12" Fill="{DynamicResource ThemeAccentBrush}"/>
-                  </Grid>
-                </ControlTemplate>
-              </Thumb.Template>
-            </Thumb>
-          </Track>
-        </Grid>
-      </ControlTemplate>
-    </Setter>
+<Styles xmlns="https://github.com/avaloniaui" 
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <Styles.Resources>
+    <Thickness x:Key="SliderTopHeaderMargin">0,0,0,4</Thickness>
+    <x:Double x:Key="SliderPreContentMargin">15</x:Double>
+    <x:Double x:Key="SliderPostContentMargin">15</x:Double>
+    <x:Double x:Key="SliderHorizontalHeight">32</x:Double>
+    <x:Double x:Key="SliderVerticalWidth">32</x:Double>
+    <x:Double x:Key="SliderThumbCornerRadius">10</x:Double>
+    <x:Double x:Key="SliderHorizontalThumbWidth">20</x:Double>
+    <x:Double x:Key="SliderHorizontalThumbHeight">20</x:Double>
+    <x:Double x:Key="SliderVerticalThumbWidth">20</x:Double>
+    <x:Double x:Key="SliderVerticalThumbHeight">20</x:Double>
+  </Styles.Resources>
+
+
+  <!-- Disabled State -->
+  <Style Selector="Slider:disabled /template/ ContentPresenter#HeaderContentPresenter">
+    <Setter Property="Foreground" Value="{DynamicResource SliderHeaderForegroundDisabled}" />
   </Style>
-  <Style Selector="Slider:vertical">
-    <Setter Property="MinWidth" Value="20"/>
-    <Setter Property="MinHeight" Value="40"/>
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Grid>
-          <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="Auto"/>
-            <ColumnDefinition Width="Auto" MinWidth="26"/>
-            <ColumnDefinition Width="Auto"/>
-          </Grid.ColumnDefinitions>
-          <Border Name="TrackBackground" Grid.Column="1" Width="4" Margin="0,6" HorizontalAlignment="Center"/>
-          <Track Name="PART_Track" Grid.Column="1" Orientation="Vertical" IsDirectionReversed="True">
-            <Track.DecreaseButton>
-               <RepeatButton Name="PART_DecreaseButton"
-                             Classes="repeattrack" />
-            </Track.DecreaseButton>
-            <Track.IncreaseButton>
-               <RepeatButton Name="PART_IncreaseButton"
-                             Classes="repeattrack" />
-            </Track.IncreaseButton>
-            <Thumb Name="thumb" MinWidth="20" MinHeight="20">
-              <Thumb.Template>
-                <ControlTemplate>
-                  <Grid>
-                    <Ellipse Width="12" Height="12" Fill="{DynamicResource ThemeAccentBrush}"/>
-                  </Grid>
-                </ControlTemplate>
-              </Thumb.Template>
-            </Thumb>
-          </Track>
-        </Grid>
-      </ControlTemplate>
-    </Setter>
+  <Style Selector="Slider:disabled /template/ Rectangle#HorizontalDecreaseRect">
+    <Setter Property="Fill" Value="{DynamicResource SliderTrackValueFillDisabled}" />
+  </Style>
+  <Style Selector="Slider:disabled /template/ Rectangle#HorizontalTrackRect">
+    <Setter Property="Fill" Value="{DynamicResource SliderTrackFillDisabled}" />
+  </Style>
+  <Style Selector="Slider:disabled /template/ Rectangle#VerticalDecreaseRect">
+    <Setter Property="Fill" Value="{DynamicResource SliderTrackValueFillDisabled}" />
+  </Style>
+  <Style Selector="Slider:disabled /template/ Rectangle#VerticalTrackRect">
+    <Setter Property="Fill" Value="{DynamicResource SliderTrackFillDisabled}" />
   </Style>
-  <Style Selector="Slider /template/ Track#PART_Track">
-    <Setter Property="Minimum" Value="{TemplateBinding Minimum}"/>
-    <Setter Property="Maximum" Value="{TemplateBinding Maximum}"/>
-    <Setter Property="Value" Value="{TemplateBinding Value, Mode=TwoWay}"/>
+  <Style Selector="Slider:disabled /template/ Thumb#HorizontalThumb">
+    <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundDisabled}" />
   </Style>
-  <Style Selector="Slider /template/ Border#TrackBackground">
-    <Setter Property="BorderThickness" Value="2"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderLowBrush}"/>
+  <Style Selector="Slider:disabled /template/ Thumb#HorizontalThumb">
+    <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundDisabled}" />
   </Style>
-  <Style Selector="Slider /template/ RepeatButton.repeattrack">
-    <Setter Property="Background" Value="Transparent"/>
-    <Setter Property="Foreground" Value="{DynamicResource ThemeBorderLowBrush}"/>
+
+
+      <VisualState x:Name="Disabled">
+
+        <Storyboard>  
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="" Storyboard.TargetProperty="">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource }" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalThumb" Storyboard.TargetProperty="Background">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource }" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="TopTickBar" Storyboard.TargetProperty="Fill">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTickBarFillDisabled}" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BottomTickBar" Storyboard.TargetProperty="Fill">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTickBarFillDisabled}" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="LeftTickBar" Storyboard.TargetProperty="Fill">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTickBarFillDisabled}" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RightTickBar" Storyboard.TargetProperty="Fill">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTickBarFillDisabled}" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SliderContainer" Storyboard.TargetProperty="Background">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderContainerBackgroundDisabled}" />
+          </ObjectAnimationUsingKeyFrames>
+        </Storyboard>
+      </VisualState>
+
+
+  <VisualStateManager.VisualStateGroups>
+    <VisualStateGroup x:Name="CommonStates">
+      <VisualState x:Name="Normal" />
+
+      <VisualState x:Name="Pressed">
+
+        <Storyboard>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HorizontalTrackRect" Storyboard.TargetProperty="Fill">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTrackFillPressed}" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalTrackRect" Storyboard.TargetProperty="Fill">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTrackFillPressed}" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HorizontalThumb" Storyboard.TargetProperty="Background">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderThumbBackgroundPressed}" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalThumb" Storyboard.TargetProperty="Background">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderThumbBackgroundPressed}" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SliderContainer" Storyboard.TargetProperty="Background">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderContainerBackgroundPressed}" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HorizontalDecreaseRect" Storyboard.TargetProperty="Fill">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTrackValueFillPressed}" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalDecreaseRect" Storyboard.TargetProperty="Fill">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTrackValueFillPressed}" />
+          </ObjectAnimationUsingKeyFrames>
+        </Storyboard>
+      </VisualState>
+
+
+      <VisualState x:Name="PointerOver">
+
+        <Storyboard>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HorizontalTrackRect" Storyboard.TargetProperty="Fill">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTrackFillPointerOver}" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalTrackRect" Storyboard.TargetProperty="Fill">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTrackFillPointerOver}" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HorizontalThumb" Storyboard.TargetProperty="Background">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderThumbBackgroundPointerOver}" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalThumb" Storyboard.TargetProperty="Background">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderThumbBackgroundPointerOver}" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SliderContainer" Storyboard.TargetProperty="Background">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderContainerBackgroundPointerOver}" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HorizontalDecreaseRect" Storyboard.TargetProperty="Fill">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTrackValueFillPointerOver}" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalDecreaseRect" Storyboard.TargetProperty="Fill">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTrackValueFillPointerOver}" />
+          </ObjectAnimationUsingKeyFrames>
+        </Storyboard>
+      </VisualState>
+
+    </VisualStateGroup>
+    <VisualStateGroup x:Name="FocusEngagementStates">
+      <VisualState x:Name="FocusDisengaged" />
+      <VisualState x:Name="FocusEngagedHorizontal">
+
+        <Storyboard>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SliderContainer" Storyboard.TargetProperty="(Control.IsTemplateFocusTarget)">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="False" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HorizontalThumb" Storyboard.TargetProperty="(Control.IsTemplateFocusTarget)">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="True" />
+          </ObjectAnimationUsingKeyFrames>
+        </Storyboard>
+      </VisualState>
+      <VisualState x:Name="FocusEngagedVertical">
+
+        <Storyboard>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SliderContainer" Storyboard.TargetProperty="(Control.IsTemplateFocusTarget)">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="False" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalThumb" Storyboard.TargetProperty="(Control.IsTemplateFocusTarget)">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="True" />
+          </ObjectAnimationUsingKeyFrames>
+        </Storyboard>
+      </VisualState>
+
+    </VisualStateGroup>
+
+  </VisualStateManager.VisualStateGroups>
+
+
+
+  <Style Selector="Slider">
+    <Setter Property="Background" Value="{DynamicResource SliderTrackFill}" />
+    <Setter Property="BorderThickness" Value="{DynamicResource SliderBorderThemeThickness}" />
+    <Setter Property="Foreground" Value="{DynamicResource SliderTrackValueFill}" />
+    <Setter Property="FontFamily" Value="{DynamicResource ContentControlThemeFontFamily}" />
+    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+    <Setter Property="ManipulationMode" Value="None" />
+    <Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
+    <Setter Property="FocusVisualMargin" Value="-7,0,-7,0" />
+    <Setter Property="IsFocusEngagementEnabled" Value="True" />
+    <!-- NOTE: This was a contract7Present:Setter, not sure if this is correct -->
+    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
     <Setter Property="Template">
+      <Setter.Value>
         <ControlTemplate>
-            <Border Background="{TemplateBinding Background}" />
+          <Grid Margin="{TemplateBinding Padding}">
+            <Grid.Resources>
+              <Style TargetType="Thumb" x:Key="SliderThumbStyle">
+                <Setter Property="BorderThickness" Value="0" />
+                <Setter Property="Background" Value="{DynamicResource SliderThumbBackground}" />
+                <Setter Property="Template">
+                  <Setter.Value>
+                    <ControlTemplate TargetType="Thumb">
+                      <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{DynamicResource SliderThumbCornerRadius}" />
+                    </ControlTemplate>
+                  </Setter.Value>
+                </Setter>
+              </Style>
+            </Grid.Resources>
+
+            <Grid.RowDefinitions>
+              <RowDefinition Height="Auto" />
+              <RowDefinition Height="*" />
+            </Grid.RowDefinitions>
+
+            <ContentPresenter x:Name="HeaderContentPresenter" Grid.Row="0" Content="{TemplateBinding Header}" ContentTemplate="{TemplateBinding HeaderTemplate}" FontWeight="{DynamicResource SliderHeaderThemeFontWeight}" Foreground="{DynamicResource SliderHeaderForeground}" Margin="{DynamicResource SliderTopHeaderMargin}" TextWrapping="Wrap" Visibility="Collapsed" x:DeferLoadStrategy="Lazy"/>
+            <Grid x:Name="SliderContainer" Grid.Row="1" Background="{DynamicResource SliderContainerBackground}" Control.IsTemplateFocusTarget="True">
+              <Grid x:Name="HorizontalTemplate" MinHeight="{DynamicResource SliderHorizontalHeight}">
+
+                <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="Auto" />
+                  <ColumnDefinition Width="Auto" />
+                  <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
+
+                <Grid.RowDefinitions>
+                  <RowDefinition Height="{DynamicResource SliderPreContentMargin}" />
+                  <RowDefinition Height="Auto" />
+                  <RowDefinition Height="{DynamicResource SliderPostContentMargin}" />
+                </Grid.RowDefinitions>
+
+                <Rectangle x:Name="HorizontalTrackRect" Fill="{TemplateBinding Background}" Height="{DynamicResource SliderTrackThemeHeight}" Grid.Row="1" Grid.ColumnSpan="3" contract7Present:RadiusX="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7Present:RadiusY="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusX="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusY="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" />
+                <Rectangle x:Name="HorizontalDecreaseRect" Fill="{TemplateBinding Foreground}" Grid.Row="1" contract7Present:RadiusX="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7Present:RadiusY="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusX="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusY="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" />
+                <TickBar x:Name="TopTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderTickBarFill}" Height="{DynamicResource SliderOutsideTickBarThemeHeight}" VerticalAlignment="Bottom" Margin="0,0,0,4" Grid.ColumnSpan="3" />
+                <TickBar x:Name="HorizontalInlineTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderInlineTickBarFill}" Height="{DynamicResource SliderTrackThemeHeight}" Grid.Row="1" Grid.ColumnSpan="3" />
+                <TickBar x:Name="BottomTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderTickBarFill}" Height="{DynamicResource SliderOutsideTickBarThemeHeight}" VerticalAlignment="Top" Margin="0,4,0,0" Grid.Row="2" Grid.ColumnSpan="3" />
+                <Thumb x:Name="HorizontalThumb" Style="{StaticResource SliderThumbStyle}" DataContext="{TemplateBinding Value}" Height="{DynamicResource SliderHorizontalThumbHeight}" Width="{DynamicResource SliderHorizontalThumbWidth}" Grid.Row="0" Grid.RowSpan="3" Grid.Column="1" FocusVisualMargin="-14,-6,-14,-6" AutomationProperties.AccessibilityView="Raw" />
+              </Grid>
+              <Grid x:Name="VerticalTemplate" MinWidth="{DynamicResource SliderVerticalWidth}" Visibility="Collapsed">
+
+                <Grid.RowDefinitions>
+                  <RowDefinition Height="*" />
+                  <RowDefinition Height="Auto" />
+                  <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+
+                <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="{DynamicResource SliderPreContentMargin}" />
+                  <ColumnDefinition Width="Auto" />
+                  <ColumnDefinition Width="{DynamicResource SliderPostContentMargin}" />
+                </Grid.ColumnDefinitions>
+
+                <Rectangle x:Name="VerticalTrackRect" Fill="{TemplateBinding Background}" Width="{DynamicResource SliderTrackThemeHeight}" Grid.Column="1" Grid.RowSpan="3" contract7Present:RadiusX="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7Present:RadiusY="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusX="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusY="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" />
+                <Rectangle x:Name="VerticalDecreaseRect" Fill="{TemplateBinding Foreground}" Grid.Column="1" Grid.Row="2" contract7Present:RadiusX="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7Present:RadiusY="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusX="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusY="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" />
+                <TickBar x:Name="LeftTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderTickBarFill}" Width="{DynamicResource SliderOutsideTickBarThemeHeight}" HorizontalAlignment="Right" Margin="0,0,4,0" Grid.RowSpan="3" />
+                <TickBar x:Name="VerticalInlineTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderInlineTickBarFill}" Width="{DynamicResource SliderTrackThemeHeight}" Grid.Column="1" Grid.RowSpan="3" />
+                <TickBar x:Name="RightTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderTickBarFill}" Width="{DynamicResource SliderOutsideTickBarThemeHeight}" HorizontalAlignment="Left" Margin="4,0,0,0" Grid.Column="2" Grid.RowSpan="3" />
+                <Thumb x:Name="VerticalThumb" Style="{StaticResource SliderThumbStyle}" DataContext="{TemplateBinding Value}" Width="{DynamicResource SliderVerticalThumbWidth}" Height="{DynamicResource SliderVerticalThumbHeight}" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="3" FocusVisualMargin="-6,-14,-6,-14" AutomationProperties.AccessibilityView="Raw" />
+              </Grid>
+
+            </Grid>
+
+          </Grid>
+
         </ControlTemplate>
+      </Setter.Value>
     </Setter>
   </Style>
-    <Style Selector="Slider:disabled /template/ Grid#grid">
-        <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}" />
-    </Style>
+
 </Styles>
+
+
+
+
+
+
+    

From e4ff69e0c724fffc4455a0f940ce1b9b5a71c3da Mon Sep 17 00:00:00 2001
From: Jumar Macato <hikari.netto23@gmail.com>
Date: Thu, 28 May 2020 12:12:26 +0800
Subject: [PATCH 03/45] swap

---
 src/Avalonia.Themes.Default/Slider.xaml | 331 ++++++------------------
 src/Avalonia.Themes.Fluent/Slider.xaml  | 329 +++++++++++++++++------
 2 files changed, 330 insertions(+), 330 deletions(-)

diff --git a/src/Avalonia.Themes.Default/Slider.xaml b/src/Avalonia.Themes.Default/Slider.xaml
index f9857be906..9196663dd0 100644
--- a/src/Avalonia.Themes.Default/Slider.xaml
+++ b/src/Avalonia.Themes.Default/Slider.xaml
@@ -1,256 +1,93 @@
-<Styles xmlns="https://github.com/avaloniaui" 
-  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-  <Styles.Resources>
-    <Thickness x:Key="SliderTopHeaderMargin">0,0,0,4</Thickness>
-    <x:Double x:Key="SliderPreContentMargin">15</x:Double>
-    <x:Double x:Key="SliderPostContentMargin">15</x:Double>
-    <x:Double x:Key="SliderHorizontalHeight">32</x:Double>
-    <x:Double x:Key="SliderVerticalWidth">32</x:Double>
-    <x:Double x:Key="SliderThumbCornerRadius">10</x:Double>
-    <x:Double x:Key="SliderHorizontalThumbWidth">20</x:Double>
-    <x:Double x:Key="SliderHorizontalThumbHeight">20</x:Double>
-    <x:Double x:Key="SliderVerticalThumbWidth">20</x:Double>
-    <x:Double x:Key="SliderVerticalThumbHeight">20</x:Double>
-  </Styles.Resources>
-
-
-  <!-- Disabled State -->
-  <Style Selector="Slider:disabled /template/ ContentPresenter#HeaderContentPresenter">
-    <Setter Property="Foreground" Value="{DynamicResource SliderHeaderForegroundDisabled}" />
-  </Style>
-  <Style Selector="Slider:disabled /template/ Rectangle#HorizontalDecreaseRect">
-    <Setter Property="Fill" Value="{DynamicResource SliderTrackValueFillDisabled}" />
-  </Style>
-  <Style Selector="Slider:disabled /template/ Rectangle#HorizontalTrackRect">
-    <Setter Property="Fill" Value="{DynamicResource SliderTrackFillDisabled}" />
-  </Style>
-  <Style Selector="Slider:disabled /template/ Rectangle#VerticalDecreaseRect">
-    <Setter Property="Fill" Value="{DynamicResource SliderTrackValueFillDisabled}" />
+<Styles xmlns="https://github.com/avaloniaui">
+  <Style Selector="Slider:horizontal">
+    <Setter Property="MinWidth" Value="40"/>
+    <Setter Property="MinHeight" Value="20"/>
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Grid Name="grid">
+          <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto" MinHeight="20"/>
+            <RowDefinition Height="Auto"/>
+          </Grid.RowDefinitions>
+          <Border Name="TrackBackground" Grid.Row="1" Height="4" Margin="6,0" VerticalAlignment="Center"/>
+          <Track Name="PART_Track" Grid.Row="1" Orientation="Horizontal">
+            <Track.DecreaseButton>
+               <RepeatButton Name="PART_DecreaseButton"
+                             Classes="repeattrack" />
+            </Track.DecreaseButton>
+            <Track.IncreaseButton>
+               <RepeatButton Name="PART_IncreaseButton"
+                             Classes="repeattrack" />
+            </Track.IncreaseButton>
+            <Thumb Name="thumb" MinWidth="20" MinHeight="20">
+              <Thumb.Template>
+                <ControlTemplate>
+                  <Grid>
+                    <Ellipse Width="12" Height="12" Fill="{DynamicResource ThemeAccentBrush}"/>
+                  </Grid>
+                </ControlTemplate>
+              </Thumb.Template>
+            </Thumb>
+          </Track>
+        </Grid>
+      </ControlTemplate>
+    </Setter>
   </Style>
-  <Style Selector="Slider:disabled /template/ Rectangle#VerticalTrackRect">
-    <Setter Property="Fill" Value="{DynamicResource SliderTrackFillDisabled}" />
+  <Style Selector="Slider:vertical">
+    <Setter Property="MinWidth" Value="20"/>
+    <Setter Property="MinHeight" Value="40"/>
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Grid>
+          <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="Auto" MinWidth="26"/>
+            <ColumnDefinition Width="Auto"/>
+          </Grid.ColumnDefinitions>
+          <Border Name="TrackBackground" Grid.Column="1" Width="4" Margin="0,6" HorizontalAlignment="Center"/>
+          <Track Name="PART_Track" Grid.Column="1" Orientation="Vertical" IsDirectionReversed="True">
+            <Track.DecreaseButton>
+               <RepeatButton Name="PART_DecreaseButton"
+                             Classes="repeattrack" />
+            </Track.DecreaseButton>
+            <Track.IncreaseButton>
+               <RepeatButton Name="PART_IncreaseButton"
+                             Classes="repeattrack" />
+            </Track.IncreaseButton>
+            <Thumb Name="thumb" MinWidth="20" MinHeight="20">
+              <Thumb.Template>
+                <ControlTemplate>
+                  <Grid>
+                    <Ellipse Width="12" Height="12" Fill="{DynamicResource ThemeAccentBrush}"/>
+                  </Grid>
+                </ControlTemplate>
+              </Thumb.Template>
+            </Thumb>
+          </Track>
+        </Grid>
+      </ControlTemplate>
+    </Setter>
   </Style>
-  <Style Selector="Slider:disabled /template/ Thumb#HorizontalThumb">
-    <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundDisabled}" />
+  <Style Selector="Slider /template/ Track#PART_Track">
+    <Setter Property="Minimum" Value="{TemplateBinding Minimum}"/>
+    <Setter Property="Maximum" Value="{TemplateBinding Maximum}"/>
+    <Setter Property="Value" Value="{TemplateBinding Value, Mode=TwoWay}"/>
   </Style>
-  <Style Selector="Slider:disabled /template/ Thumb#HorizontalThumb">
-    <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundDisabled}" />
+  <Style Selector="Slider /template/ Border#TrackBackground">
+    <Setter Property="BorderThickness" Value="2"/>
+    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderLowBrush}"/>
   </Style>
-
-
-      <VisualState x:Name="Disabled">
-
-        <Storyboard>  
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="" Storyboard.TargetProperty="">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource }" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalThumb" Storyboard.TargetProperty="Background">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource }" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="TopTickBar" Storyboard.TargetProperty="Fill">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTickBarFillDisabled}" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BottomTickBar" Storyboard.TargetProperty="Fill">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTickBarFillDisabled}" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="LeftTickBar" Storyboard.TargetProperty="Fill">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTickBarFillDisabled}" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RightTickBar" Storyboard.TargetProperty="Fill">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTickBarFillDisabled}" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SliderContainer" Storyboard.TargetProperty="Background">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderContainerBackgroundDisabled}" />
-          </ObjectAnimationUsingKeyFrames>
-        </Storyboard>
-      </VisualState>
-
-
-  <VisualStateManager.VisualStateGroups>
-    <VisualStateGroup x:Name="CommonStates">
-      <VisualState x:Name="Normal" />
-
-      <VisualState x:Name="Pressed">
-
-        <Storyboard>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HorizontalTrackRect" Storyboard.TargetProperty="Fill">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTrackFillPressed}" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalTrackRect" Storyboard.TargetProperty="Fill">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTrackFillPressed}" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HorizontalThumb" Storyboard.TargetProperty="Background">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderThumbBackgroundPressed}" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalThumb" Storyboard.TargetProperty="Background">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderThumbBackgroundPressed}" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SliderContainer" Storyboard.TargetProperty="Background">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderContainerBackgroundPressed}" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HorizontalDecreaseRect" Storyboard.TargetProperty="Fill">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTrackValueFillPressed}" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalDecreaseRect" Storyboard.TargetProperty="Fill">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTrackValueFillPressed}" />
-          </ObjectAnimationUsingKeyFrames>
-        </Storyboard>
-      </VisualState>
-
-
-      <VisualState x:Name="PointerOver">
-
-        <Storyboard>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HorizontalTrackRect" Storyboard.TargetProperty="Fill">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTrackFillPointerOver}" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalTrackRect" Storyboard.TargetProperty="Fill">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTrackFillPointerOver}" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HorizontalThumb" Storyboard.TargetProperty="Background">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderThumbBackgroundPointerOver}" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalThumb" Storyboard.TargetProperty="Background">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderThumbBackgroundPointerOver}" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SliderContainer" Storyboard.TargetProperty="Background">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderContainerBackgroundPointerOver}" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HorizontalDecreaseRect" Storyboard.TargetProperty="Fill">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTrackValueFillPointerOver}" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalDecreaseRect" Storyboard.TargetProperty="Fill">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTrackValueFillPointerOver}" />
-          </ObjectAnimationUsingKeyFrames>
-        </Storyboard>
-      </VisualState>
-
-    </VisualStateGroup>
-    <VisualStateGroup x:Name="FocusEngagementStates">
-      <VisualState x:Name="FocusDisengaged" />
-      <VisualState x:Name="FocusEngagedHorizontal">
-
-        <Storyboard>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SliderContainer" Storyboard.TargetProperty="(Control.IsTemplateFocusTarget)">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="False" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HorizontalThumb" Storyboard.TargetProperty="(Control.IsTemplateFocusTarget)">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="True" />
-          </ObjectAnimationUsingKeyFrames>
-        </Storyboard>
-      </VisualState>
-      <VisualState x:Name="FocusEngagedVertical">
-
-        <Storyboard>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SliderContainer" Storyboard.TargetProperty="(Control.IsTemplateFocusTarget)">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="False" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalThumb" Storyboard.TargetProperty="(Control.IsTemplateFocusTarget)">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="True" />
-          </ObjectAnimationUsingKeyFrames>
-        </Storyboard>
-      </VisualState>
-
-    </VisualStateGroup>
-
-  </VisualStateManager.VisualStateGroups>
-
-
-
-  <Style Selector="Slider">
-    <Setter Property="Background" Value="{DynamicResource SliderTrackFill}" />
-    <Setter Property="BorderThickness" Value="{DynamicResource SliderBorderThemeThickness}" />
-    <Setter Property="Foreground" Value="{DynamicResource SliderTrackValueFill}" />
-    <Setter Property="FontFamily" Value="{DynamicResource ContentControlThemeFontFamily}" />
-    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-    <Setter Property="ManipulationMode" Value="None" />
-    <Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
-    <Setter Property="FocusVisualMargin" Value="-7,0,-7,0" />
-    <Setter Property="IsFocusEngagementEnabled" Value="True" />
-    <!-- NOTE: This was a contract7Present:Setter, not sure if this is correct -->
-    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+  <Style Selector="Slider /template/ RepeatButton.repeattrack">
+    <Setter Property="Background" Value="Transparent"/>
+    <Setter Property="Foreground" Value="{DynamicResource ThemeBorderLowBrush}"/>
     <Setter Property="Template">
-      <Setter.Value>
         <ControlTemplate>
-          <Grid Margin="{TemplateBinding Padding}">
-            <Grid.Resources>
-              <Style TargetType="Thumb" x:Key="SliderThumbStyle">
-                <Setter Property="BorderThickness" Value="0" />
-                <Setter Property="Background" Value="{DynamicResource SliderThumbBackground}" />
-                <Setter Property="Template">
-                  <Setter.Value>
-                    <ControlTemplate TargetType="Thumb">
-                      <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{DynamicResource SliderThumbCornerRadius}" />
-                    </ControlTemplate>
-                  </Setter.Value>
-                </Setter>
-              </Style>
-            </Grid.Resources>
-
-            <Grid.RowDefinitions>
-              <RowDefinition Height="Auto" />
-              <RowDefinition Height="*" />
-            </Grid.RowDefinitions>
-
-            <ContentPresenter x:Name="HeaderContentPresenter" Grid.Row="0" Content="{TemplateBinding Header}" ContentTemplate="{TemplateBinding HeaderTemplate}" FontWeight="{DynamicResource SliderHeaderThemeFontWeight}" Foreground="{DynamicResource SliderHeaderForeground}" Margin="{DynamicResource SliderTopHeaderMargin}" TextWrapping="Wrap" Visibility="Collapsed" x:DeferLoadStrategy="Lazy"/>
-            <Grid x:Name="SliderContainer" Grid.Row="1" Background="{DynamicResource SliderContainerBackground}" Control.IsTemplateFocusTarget="True">
-              <Grid x:Name="HorizontalTemplate" MinHeight="{DynamicResource SliderHorizontalHeight}">
-
-                <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
-
-                <Grid.RowDefinitions>
-                  <RowDefinition Height="{DynamicResource SliderPreContentMargin}" />
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="{DynamicResource SliderPostContentMargin}" />
-                </Grid.RowDefinitions>
-
-                <Rectangle x:Name="HorizontalTrackRect" Fill="{TemplateBinding Background}" Height="{DynamicResource SliderTrackThemeHeight}" Grid.Row="1" Grid.ColumnSpan="3" contract7Present:RadiusX="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7Present:RadiusY="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusX="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusY="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" />
-                <Rectangle x:Name="HorizontalDecreaseRect" Fill="{TemplateBinding Foreground}" Grid.Row="1" contract7Present:RadiusX="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7Present:RadiusY="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusX="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusY="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" />
-                <TickBar x:Name="TopTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderTickBarFill}" Height="{DynamicResource SliderOutsideTickBarThemeHeight}" VerticalAlignment="Bottom" Margin="0,0,0,4" Grid.ColumnSpan="3" />
-                <TickBar x:Name="HorizontalInlineTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderInlineTickBarFill}" Height="{DynamicResource SliderTrackThemeHeight}" Grid.Row="1" Grid.ColumnSpan="3" />
-                <TickBar x:Name="BottomTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderTickBarFill}" Height="{DynamicResource SliderOutsideTickBarThemeHeight}" VerticalAlignment="Top" Margin="0,4,0,0" Grid.Row="2" Grid.ColumnSpan="3" />
-                <Thumb x:Name="HorizontalThumb" Style="{StaticResource SliderThumbStyle}" DataContext="{TemplateBinding Value}" Height="{DynamicResource SliderHorizontalThumbHeight}" Width="{DynamicResource SliderHorizontalThumbWidth}" Grid.Row="0" Grid.RowSpan="3" Grid.Column="1" FocusVisualMargin="-14,-6,-14,-6" AutomationProperties.AccessibilityView="Raw" />
-              </Grid>
-              <Grid x:Name="VerticalTemplate" MinWidth="{DynamicResource SliderVerticalWidth}" Visibility="Collapsed">
-
-                <Grid.RowDefinitions>
-                  <RowDefinition Height="*" />
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-                </Grid.RowDefinitions>
-
-                <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="{DynamicResource SliderPreContentMargin}" />
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="{DynamicResource SliderPostContentMargin}" />
-                </Grid.ColumnDefinitions>
-
-                <Rectangle x:Name="VerticalTrackRect" Fill="{TemplateBinding Background}" Width="{DynamicResource SliderTrackThemeHeight}" Grid.Column="1" Grid.RowSpan="3" contract7Present:RadiusX="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7Present:RadiusY="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusX="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusY="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" />
-                <Rectangle x:Name="VerticalDecreaseRect" Fill="{TemplateBinding Foreground}" Grid.Column="1" Grid.Row="2" contract7Present:RadiusX="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7Present:RadiusY="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusX="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusY="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" />
-                <TickBar x:Name="LeftTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderTickBarFill}" Width="{DynamicResource SliderOutsideTickBarThemeHeight}" HorizontalAlignment="Right" Margin="0,0,4,0" Grid.RowSpan="3" />
-                <TickBar x:Name="VerticalInlineTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderInlineTickBarFill}" Width="{DynamicResource SliderTrackThemeHeight}" Grid.Column="1" Grid.RowSpan="3" />
-                <TickBar x:Name="RightTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderTickBarFill}" Width="{DynamicResource SliderOutsideTickBarThemeHeight}" HorizontalAlignment="Left" Margin="4,0,0,0" Grid.Column="2" Grid.RowSpan="3" />
-                <Thumb x:Name="VerticalThumb" Style="{StaticResource SliderThumbStyle}" DataContext="{TemplateBinding Value}" Width="{DynamicResource SliderVerticalThumbWidth}" Height="{DynamicResource SliderVerticalThumbHeight}" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="3" FocusVisualMargin="-6,-14,-6,-14" AutomationProperties.AccessibilityView="Raw" />
-              </Grid>
-
-            </Grid>
-
-          </Grid>
-
+            <Border Background="{TemplateBinding Background}" />
         </ControlTemplate>
-      </Setter.Value>
     </Setter>
   </Style>
-
-</Styles>
-
-
-
-
-
-
-    
+    <Style Selector="Slider:disabled /template/ Grid#grid">
+        <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}" />
+    </Style>
+</Styles>
\ No newline at end of file
diff --git a/src/Avalonia.Themes.Fluent/Slider.xaml b/src/Avalonia.Themes.Fluent/Slider.xaml
index b21cbf3650..f9857be906 100644
--- a/src/Avalonia.Themes.Fluent/Slider.xaml
+++ b/src/Avalonia.Themes.Fluent/Slider.xaml
@@ -1,93 +1,256 @@
-<Styles xmlns="https://github.com/avaloniaui">
-  <Style Selector="Slider:horizontal">
-    <Setter Property="MinWidth" Value="40"/>
-    <Setter Property="MinHeight" Value="20"/>
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Grid Name="grid">
-          <Grid.RowDefinitions>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="Auto" MinHeight="20"/>
-            <RowDefinition Height="Auto"/>
-          </Grid.RowDefinitions>
-          <Border Name="TrackBackground" Grid.Row="1" Height="4" Margin="6,0" VerticalAlignment="Center"/>
-          <Track Name="PART_Track" Grid.Row="1" Orientation="Horizontal">
-            <Track.DecreaseButton>
-               <RepeatButton Name="PART_DecreaseButton"
-                             Classes="repeattrack" />
-            </Track.DecreaseButton>
-            <Track.IncreaseButton>
-               <RepeatButton Name="PART_IncreaseButton"
-                             Classes="repeattrack" />
-            </Track.IncreaseButton>
-            <Thumb Name="thumb" MinWidth="20" MinHeight="20">
-              <Thumb.Template>
-                <ControlTemplate>
-                  <Grid>
-                    <Ellipse Width="12" Height="12" Fill="{DynamicResource ThemeAccentBrush}"/>
-                  </Grid>
-                </ControlTemplate>
-              </Thumb.Template>
-            </Thumb>
-          </Track>
-        </Grid>
-      </ControlTemplate>
-    </Setter>
+<Styles xmlns="https://github.com/avaloniaui" 
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <Styles.Resources>
+    <Thickness x:Key="SliderTopHeaderMargin">0,0,0,4</Thickness>
+    <x:Double x:Key="SliderPreContentMargin">15</x:Double>
+    <x:Double x:Key="SliderPostContentMargin">15</x:Double>
+    <x:Double x:Key="SliderHorizontalHeight">32</x:Double>
+    <x:Double x:Key="SliderVerticalWidth">32</x:Double>
+    <x:Double x:Key="SliderThumbCornerRadius">10</x:Double>
+    <x:Double x:Key="SliderHorizontalThumbWidth">20</x:Double>
+    <x:Double x:Key="SliderHorizontalThumbHeight">20</x:Double>
+    <x:Double x:Key="SliderVerticalThumbWidth">20</x:Double>
+    <x:Double x:Key="SliderVerticalThumbHeight">20</x:Double>
+  </Styles.Resources>
+
+
+  <!-- Disabled State -->
+  <Style Selector="Slider:disabled /template/ ContentPresenter#HeaderContentPresenter">
+    <Setter Property="Foreground" Value="{DynamicResource SliderHeaderForegroundDisabled}" />
   </Style>
-  <Style Selector="Slider:vertical">
-    <Setter Property="MinWidth" Value="20"/>
-    <Setter Property="MinHeight" Value="40"/>
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Grid>
-          <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="Auto"/>
-            <ColumnDefinition Width="Auto" MinWidth="26"/>
-            <ColumnDefinition Width="Auto"/>
-          </Grid.ColumnDefinitions>
-          <Border Name="TrackBackground" Grid.Column="1" Width="4" Margin="0,6" HorizontalAlignment="Center"/>
-          <Track Name="PART_Track" Grid.Column="1" Orientation="Vertical" IsDirectionReversed="True">
-            <Track.DecreaseButton>
-               <RepeatButton Name="PART_DecreaseButton"
-                             Classes="repeattrack" />
-            </Track.DecreaseButton>
-            <Track.IncreaseButton>
-               <RepeatButton Name="PART_IncreaseButton"
-                             Classes="repeattrack" />
-            </Track.IncreaseButton>
-            <Thumb Name="thumb" MinWidth="20" MinHeight="20">
-              <Thumb.Template>
-                <ControlTemplate>
-                  <Grid>
-                    <Ellipse Width="12" Height="12" Fill="{DynamicResource ThemeAccentBrush}"/>
-                  </Grid>
-                </ControlTemplate>
-              </Thumb.Template>
-            </Thumb>
-          </Track>
-        </Grid>
-      </ControlTemplate>
-    </Setter>
+  <Style Selector="Slider:disabled /template/ Rectangle#HorizontalDecreaseRect">
+    <Setter Property="Fill" Value="{DynamicResource SliderTrackValueFillDisabled}" />
+  </Style>
+  <Style Selector="Slider:disabled /template/ Rectangle#HorizontalTrackRect">
+    <Setter Property="Fill" Value="{DynamicResource SliderTrackFillDisabled}" />
+  </Style>
+  <Style Selector="Slider:disabled /template/ Rectangle#VerticalDecreaseRect">
+    <Setter Property="Fill" Value="{DynamicResource SliderTrackValueFillDisabled}" />
+  </Style>
+  <Style Selector="Slider:disabled /template/ Rectangle#VerticalTrackRect">
+    <Setter Property="Fill" Value="{DynamicResource SliderTrackFillDisabled}" />
   </Style>
-  <Style Selector="Slider /template/ Track#PART_Track">
-    <Setter Property="Minimum" Value="{TemplateBinding Minimum}"/>
-    <Setter Property="Maximum" Value="{TemplateBinding Maximum}"/>
-    <Setter Property="Value" Value="{TemplateBinding Value, Mode=TwoWay}"/>
+  <Style Selector="Slider:disabled /template/ Thumb#HorizontalThumb">
+    <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundDisabled}" />
   </Style>
-  <Style Selector="Slider /template/ Border#TrackBackground">
-    <Setter Property="BorderThickness" Value="2"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderLowBrush}"/>
+  <Style Selector="Slider:disabled /template/ Thumb#HorizontalThumb">
+    <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundDisabled}" />
   </Style>
-  <Style Selector="Slider /template/ RepeatButton.repeattrack">
-    <Setter Property="Background" Value="Transparent"/>
-    <Setter Property="Foreground" Value="{DynamicResource ThemeBorderLowBrush}"/>
+
+
+      <VisualState x:Name="Disabled">
+
+        <Storyboard>  
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="" Storyboard.TargetProperty="">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource }" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalThumb" Storyboard.TargetProperty="Background">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource }" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="TopTickBar" Storyboard.TargetProperty="Fill">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTickBarFillDisabled}" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BottomTickBar" Storyboard.TargetProperty="Fill">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTickBarFillDisabled}" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="LeftTickBar" Storyboard.TargetProperty="Fill">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTickBarFillDisabled}" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RightTickBar" Storyboard.TargetProperty="Fill">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTickBarFillDisabled}" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SliderContainer" Storyboard.TargetProperty="Background">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderContainerBackgroundDisabled}" />
+          </ObjectAnimationUsingKeyFrames>
+        </Storyboard>
+      </VisualState>
+
+
+  <VisualStateManager.VisualStateGroups>
+    <VisualStateGroup x:Name="CommonStates">
+      <VisualState x:Name="Normal" />
+
+      <VisualState x:Name="Pressed">
+
+        <Storyboard>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HorizontalTrackRect" Storyboard.TargetProperty="Fill">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTrackFillPressed}" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalTrackRect" Storyboard.TargetProperty="Fill">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTrackFillPressed}" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HorizontalThumb" Storyboard.TargetProperty="Background">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderThumbBackgroundPressed}" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalThumb" Storyboard.TargetProperty="Background">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderThumbBackgroundPressed}" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SliderContainer" Storyboard.TargetProperty="Background">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderContainerBackgroundPressed}" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HorizontalDecreaseRect" Storyboard.TargetProperty="Fill">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTrackValueFillPressed}" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalDecreaseRect" Storyboard.TargetProperty="Fill">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTrackValueFillPressed}" />
+          </ObjectAnimationUsingKeyFrames>
+        </Storyboard>
+      </VisualState>
+
+
+      <VisualState x:Name="PointerOver">
+
+        <Storyboard>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HorizontalTrackRect" Storyboard.TargetProperty="Fill">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTrackFillPointerOver}" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalTrackRect" Storyboard.TargetProperty="Fill">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTrackFillPointerOver}" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HorizontalThumb" Storyboard.TargetProperty="Background">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderThumbBackgroundPointerOver}" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalThumb" Storyboard.TargetProperty="Background">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderThumbBackgroundPointerOver}" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SliderContainer" Storyboard.TargetProperty="Background">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderContainerBackgroundPointerOver}" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HorizontalDecreaseRect" Storyboard.TargetProperty="Fill">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTrackValueFillPointerOver}" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalDecreaseRect" Storyboard.TargetProperty="Fill">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTrackValueFillPointerOver}" />
+          </ObjectAnimationUsingKeyFrames>
+        </Storyboard>
+      </VisualState>
+
+    </VisualStateGroup>
+    <VisualStateGroup x:Name="FocusEngagementStates">
+      <VisualState x:Name="FocusDisengaged" />
+      <VisualState x:Name="FocusEngagedHorizontal">
+
+        <Storyboard>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SliderContainer" Storyboard.TargetProperty="(Control.IsTemplateFocusTarget)">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="False" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HorizontalThumb" Storyboard.TargetProperty="(Control.IsTemplateFocusTarget)">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="True" />
+          </ObjectAnimationUsingKeyFrames>
+        </Storyboard>
+      </VisualState>
+      <VisualState x:Name="FocusEngagedVertical">
+
+        <Storyboard>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SliderContainer" Storyboard.TargetProperty="(Control.IsTemplateFocusTarget)">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="False" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalThumb" Storyboard.TargetProperty="(Control.IsTemplateFocusTarget)">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="True" />
+          </ObjectAnimationUsingKeyFrames>
+        </Storyboard>
+      </VisualState>
+
+    </VisualStateGroup>
+
+  </VisualStateManager.VisualStateGroups>
+
+
+
+  <Style Selector="Slider">
+    <Setter Property="Background" Value="{DynamicResource SliderTrackFill}" />
+    <Setter Property="BorderThickness" Value="{DynamicResource SliderBorderThemeThickness}" />
+    <Setter Property="Foreground" Value="{DynamicResource SliderTrackValueFill}" />
+    <Setter Property="FontFamily" Value="{DynamicResource ContentControlThemeFontFamily}" />
+    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+    <Setter Property="ManipulationMode" Value="None" />
+    <Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
+    <Setter Property="FocusVisualMargin" Value="-7,0,-7,0" />
+    <Setter Property="IsFocusEngagementEnabled" Value="True" />
+    <!-- NOTE: This was a contract7Present:Setter, not sure if this is correct -->
+    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
     <Setter Property="Template">
+      <Setter.Value>
         <ControlTemplate>
-            <Border Background="{TemplateBinding Background}" />
+          <Grid Margin="{TemplateBinding Padding}">
+            <Grid.Resources>
+              <Style TargetType="Thumb" x:Key="SliderThumbStyle">
+                <Setter Property="BorderThickness" Value="0" />
+                <Setter Property="Background" Value="{DynamicResource SliderThumbBackground}" />
+                <Setter Property="Template">
+                  <Setter.Value>
+                    <ControlTemplate TargetType="Thumb">
+                      <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{DynamicResource SliderThumbCornerRadius}" />
+                    </ControlTemplate>
+                  </Setter.Value>
+                </Setter>
+              </Style>
+            </Grid.Resources>
+
+            <Grid.RowDefinitions>
+              <RowDefinition Height="Auto" />
+              <RowDefinition Height="*" />
+            </Grid.RowDefinitions>
+
+            <ContentPresenter x:Name="HeaderContentPresenter" Grid.Row="0" Content="{TemplateBinding Header}" ContentTemplate="{TemplateBinding HeaderTemplate}" FontWeight="{DynamicResource SliderHeaderThemeFontWeight}" Foreground="{DynamicResource SliderHeaderForeground}" Margin="{DynamicResource SliderTopHeaderMargin}" TextWrapping="Wrap" Visibility="Collapsed" x:DeferLoadStrategy="Lazy"/>
+            <Grid x:Name="SliderContainer" Grid.Row="1" Background="{DynamicResource SliderContainerBackground}" Control.IsTemplateFocusTarget="True">
+              <Grid x:Name="HorizontalTemplate" MinHeight="{DynamicResource SliderHorizontalHeight}">
+
+                <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="Auto" />
+                  <ColumnDefinition Width="Auto" />
+                  <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
+
+                <Grid.RowDefinitions>
+                  <RowDefinition Height="{DynamicResource SliderPreContentMargin}" />
+                  <RowDefinition Height="Auto" />
+                  <RowDefinition Height="{DynamicResource SliderPostContentMargin}" />
+                </Grid.RowDefinitions>
+
+                <Rectangle x:Name="HorizontalTrackRect" Fill="{TemplateBinding Background}" Height="{DynamicResource SliderTrackThemeHeight}" Grid.Row="1" Grid.ColumnSpan="3" contract7Present:RadiusX="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7Present:RadiusY="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusX="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusY="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" />
+                <Rectangle x:Name="HorizontalDecreaseRect" Fill="{TemplateBinding Foreground}" Grid.Row="1" contract7Present:RadiusX="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7Present:RadiusY="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusX="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusY="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" />
+                <TickBar x:Name="TopTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderTickBarFill}" Height="{DynamicResource SliderOutsideTickBarThemeHeight}" VerticalAlignment="Bottom" Margin="0,0,0,4" Grid.ColumnSpan="3" />
+                <TickBar x:Name="HorizontalInlineTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderInlineTickBarFill}" Height="{DynamicResource SliderTrackThemeHeight}" Grid.Row="1" Grid.ColumnSpan="3" />
+                <TickBar x:Name="BottomTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderTickBarFill}" Height="{DynamicResource SliderOutsideTickBarThemeHeight}" VerticalAlignment="Top" Margin="0,4,0,0" Grid.Row="2" Grid.ColumnSpan="3" />
+                <Thumb x:Name="HorizontalThumb" Style="{StaticResource SliderThumbStyle}" DataContext="{TemplateBinding Value}" Height="{DynamicResource SliderHorizontalThumbHeight}" Width="{DynamicResource SliderHorizontalThumbWidth}" Grid.Row="0" Grid.RowSpan="3" Grid.Column="1" FocusVisualMargin="-14,-6,-14,-6" AutomationProperties.AccessibilityView="Raw" />
+              </Grid>
+              <Grid x:Name="VerticalTemplate" MinWidth="{DynamicResource SliderVerticalWidth}" Visibility="Collapsed">
+
+                <Grid.RowDefinitions>
+                  <RowDefinition Height="*" />
+                  <RowDefinition Height="Auto" />
+                  <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+
+                <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="{DynamicResource SliderPreContentMargin}" />
+                  <ColumnDefinition Width="Auto" />
+                  <ColumnDefinition Width="{DynamicResource SliderPostContentMargin}" />
+                </Grid.ColumnDefinitions>
+
+                <Rectangle x:Name="VerticalTrackRect" Fill="{TemplateBinding Background}" Width="{DynamicResource SliderTrackThemeHeight}" Grid.Column="1" Grid.RowSpan="3" contract7Present:RadiusX="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7Present:RadiusY="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusX="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusY="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" />
+                <Rectangle x:Name="VerticalDecreaseRect" Fill="{TemplateBinding Foreground}" Grid.Column="1" Grid.Row="2" contract7Present:RadiusX="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7Present:RadiusY="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusX="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusY="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" />
+                <TickBar x:Name="LeftTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderTickBarFill}" Width="{DynamicResource SliderOutsideTickBarThemeHeight}" HorizontalAlignment="Right" Margin="0,0,4,0" Grid.RowSpan="3" />
+                <TickBar x:Name="VerticalInlineTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderInlineTickBarFill}" Width="{DynamicResource SliderTrackThemeHeight}" Grid.Column="1" Grid.RowSpan="3" />
+                <TickBar x:Name="RightTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderTickBarFill}" Width="{DynamicResource SliderOutsideTickBarThemeHeight}" HorizontalAlignment="Left" Margin="4,0,0,0" Grid.Column="2" Grid.RowSpan="3" />
+                <Thumb x:Name="VerticalThumb" Style="{StaticResource SliderThumbStyle}" DataContext="{TemplateBinding Value}" Width="{DynamicResource SliderVerticalThumbWidth}" Height="{DynamicResource SliderVerticalThumbHeight}" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="3" FocusVisualMargin="-6,-14,-6,-14" AutomationProperties.AccessibilityView="Raw" />
+              </Grid>
+
+            </Grid>
+
+          </Grid>
+
         </ControlTemplate>
+      </Setter.Value>
     </Setter>
   </Style>
-    <Style Selector="Slider:disabled /template/ Grid#grid">
-        <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}" />
-    </Style>
+
 </Styles>
+
+
+
+
+
+
+    

From b689ba3c6d23b6f7710f944196a74c04a0b47ab0 Mon Sep 17 00:00:00 2001
From: Jumar Macato <hikari.netto23@gmail.com>
Date: Thu, 28 May 2020 14:21:04 +0800
Subject: [PATCH 04/45] port visual states

---
 src/Avalonia.Themes.Fluent/Slider.xaml | 266 +++++++++++--------------
 1 file changed, 116 insertions(+), 150 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Slider.xaml b/src/Avalonia.Themes.Fluent/Slider.xaml
index f9857be906..014095b924 100644
--- a/src/Avalonia.Themes.Fluent/Slider.xaml
+++ b/src/Avalonia.Themes.Fluent/Slider.xaml
@@ -1,5 +1,4 @@
-<Styles xmlns="https://github.com/avaloniaui" 
-  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <Styles.Resources>
     <Thickness x:Key="SliderTopHeaderMargin">0,0,0,4</Thickness>
     <x:Double x:Key="SliderPreContentMargin">15</x:Double>
@@ -12,8 +11,7 @@
     <x:Double x:Key="SliderVerticalThumbWidth">20</x:Double>
     <x:Double x:Key="SliderVerticalThumbHeight">20</x:Double>
   </Styles.Resources>
-
-
+  
   <!-- Disabled State -->
   <Style Selector="Slider:disabled /template/ ContentPresenter#HeaderContentPresenter">
     <Setter Property="Foreground" Value="{DynamicResource SliderHeaderForegroundDisabled}" />
@@ -33,129 +31,96 @@
   <Style Selector="Slider:disabled /template/ Thumb#HorizontalThumb">
     <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundDisabled}" />
   </Style>
-  <Style Selector="Slider:disabled /template/ Thumb#HorizontalThumb">
+  <Style Selector="Slider:disabled /template/ Thumb#VerticalThumb">
     <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundDisabled}" />
   </Style>
+  <Style Selector="Slider:disabled /template/ TickBar#TopTickBar">
+    <Setter Property="Background" Value="{DynamicResource SliderTickBarFillDisabled}" />
+  </Style>
+  <Style Selector="Slider:disabled /template/ TickBar#BottomTickBar">
+    <Setter Property="Background" Value="{DynamicResource SliderTickBarFillDisabled}" />
+  </Style>
+  <Style Selector="Slider:disabled /template/ TickBar#LeftTickBar">
+    <Setter Property="Background" Value="{DynamicResource SliderTickBarFillDisabled}" />
+  </Style>
+  <Style Selector="Slider:disabled /template/ TickBar#RightTickBar">
+    <Setter Property="Background" Value="{DynamicResource SliderTickBarFillDisabled}" />
+  </Style>
+  <Style Selector="Slider:disabled /template/ Grid#SliderContainer">
+    <Setter Property="Background" Value="{DynamicResource SliderContainerBackgroundDisabled}" />
+  </Style>
+  
+  <!-- Pressed State -->
+  <Style Selector="Slider:pressed /template/ Rectangle#HorizontalTrackRect">
+    <Setter Property="Fill" Value="{DynamicResource SliderTrackFillPressed}" />
+  </Style>
+  <Style Selector="Slider:pressed /template/ Rectangle#HorizontalTrackRect">
+    <Setter Property="Fill" Value="{DynamicResource SliderTrackFillPressed}" />
+  </Style>
+  <Style Selector="Slider:pressed /template/ Rectangle#VerticalTrackRect">
+    <Setter Property="Background" Value="{DynamicResource SliderTrackFillPressed}" />
+  </Style>
+  <Style Selector="Slider:pressed /template/ Thumb#HorizontalThumb">
+    <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundPressed}" />
+  </Style>
+  <Style Selector="Slider:pressed /template/ Thumb#VerticalThumb">
+    <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundPressed}" />
+  </Style>
+  <Style Selector="Slider:pressed /template/ Grid#SliderContainer">
+    <Setter Property="Background" Value="{DynamicResource SliderContainerBackgroundPressed}" />
+  </Style>
+  <Style Selector="Slider:pressed /template/ Rectangle#HorizontalDecreaseRect">
+    <Setter Property="Fill" Value="{DynamicResource SliderTrackValueFillPressed}" />
+  </Style>
+  <Style Selector="Slider:pressed /template/ Rectangle#VerticalDecreaseRect">
+    <Setter Property="Fill" Value="{DynamicResource SliderTrackValueFillPressed}" />
+  </Style>
 
+  <!-- PointerOver State -->
+  <Style Selector="Slider:pointerover /template/ Rectangle#HorizontalTrackRect">
+    <Setter Property="Fill" Value="{DynamicResource SliderTrackFillPointerOver}" />
+  </Style>
+  <Style Selector="Slider:pointerover /template/ Rectangle#VerticalTrackRect">
+    <Setter Property="Fill" Value="{DynamicResource SliderTrackFillPointerOver}" />
+  </Style>
+  <Style Selector="Slider:pointerover /template/ Thumb#HorizontalThumb">
+    <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundPointerOver}" />
+  </Style>
+  <Style Selector="Slider:pointerover /template/ Thumb#VerticalThumb">
+    <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundPointerOver}" />
+  </Style>
+  <Style Selector="Slider:pointerover /template/ Grid#SliderContainer">
+    <Setter Property="Background" Value="{DynamicResource SliderContainerBackgroundPointerOver}" />
+  </Style>
+  <Style Selector="Slider:pointerover /template/ Rectangle#HorizontalDecreaseRect">
+    <Setter Property="Fill" Value="{DynamicResource SliderTrackValueFillPointerOver}" />
+  </Style>
+  <Style Selector="Slider:pointerover /template/ Rectangle#VerticalDecreaseRect">
+    <Setter Property="Fill" Value="{DynamicResource SliderTrackValueFillPointerOver}" />
+  </Style>
 
-      <VisualState x:Name="Disabled">
-
-        <Storyboard>  
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="" Storyboard.TargetProperty="">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource }" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalThumb" Storyboard.TargetProperty="Background">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource }" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="TopTickBar" Storyboard.TargetProperty="Fill">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTickBarFillDisabled}" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BottomTickBar" Storyboard.TargetProperty="Fill">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTickBarFillDisabled}" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="LeftTickBar" Storyboard.TargetProperty="Fill">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTickBarFillDisabled}" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RightTickBar" Storyboard.TargetProperty="Fill">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTickBarFillDisabled}" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SliderContainer" Storyboard.TargetProperty="Background">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderContainerBackgroundDisabled}" />
-          </ObjectAnimationUsingKeyFrames>
-        </Storyboard>
-      </VisualState>
-
-
-  <VisualStateManager.VisualStateGroups>
-    <VisualStateGroup x:Name="CommonStates">
-      <VisualState x:Name="Normal" />
-
-      <VisualState x:Name="Pressed">
-
-        <Storyboard>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HorizontalTrackRect" Storyboard.TargetProperty="Fill">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTrackFillPressed}" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalTrackRect" Storyboard.TargetProperty="Fill">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTrackFillPressed}" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HorizontalThumb" Storyboard.TargetProperty="Background">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderThumbBackgroundPressed}" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalThumb" Storyboard.TargetProperty="Background">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderThumbBackgroundPressed}" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SliderContainer" Storyboard.TargetProperty="Background">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderContainerBackgroundPressed}" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HorizontalDecreaseRect" Storyboard.TargetProperty="Fill">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTrackValueFillPressed}" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalDecreaseRect" Storyboard.TargetProperty="Fill">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTrackValueFillPressed}" />
-          </ObjectAnimationUsingKeyFrames>
-        </Storyboard>
-      </VisualState>
-
-
-      <VisualState x:Name="PointerOver">
-
-        <Storyboard>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HorizontalTrackRect" Storyboard.TargetProperty="Fill">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTrackFillPointerOver}" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalTrackRect" Storyboard.TargetProperty="Fill">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTrackFillPointerOver}" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HorizontalThumb" Storyboard.TargetProperty="Background">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderThumbBackgroundPointerOver}" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalThumb" Storyboard.TargetProperty="Background">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderThumbBackgroundPointerOver}" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SliderContainer" Storyboard.TargetProperty="Background">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderContainerBackgroundPointerOver}" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HorizontalDecreaseRect" Storyboard.TargetProperty="Fill">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTrackValueFillPointerOver}" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalDecreaseRect" Storyboard.TargetProperty="Fill">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTrackValueFillPointerOver}" />
-          </ObjectAnimationUsingKeyFrames>
-        </Storyboard>
-      </VisualState>
-
-    </VisualStateGroup>
-    <VisualStateGroup x:Name="FocusEngagementStates">
-      <VisualState x:Name="FocusDisengaged" />
-      <VisualState x:Name="FocusEngagedHorizontal">
-
-        <Storyboard>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SliderContainer" Storyboard.TargetProperty="(Control.IsTemplateFocusTarget)">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="False" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HorizontalThumb" Storyboard.TargetProperty="(Control.IsTemplateFocusTarget)">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="True" />
-          </ObjectAnimationUsingKeyFrames>
-        </Storyboard>
-      </VisualState>
-      <VisualState x:Name="FocusEngagedVertical">
-
-        <Storyboard>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SliderContainer" Storyboard.TargetProperty="(Control.IsTemplateFocusTarget)">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="False" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalThumb" Storyboard.TargetProperty="(Control.IsTemplateFocusTarget)">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="True" />
-          </ObjectAnimationUsingKeyFrames>
-        </Storyboard>
-      </VisualState>
-
-    </VisualStateGroup>
-
-  </VisualStateManager.VisualStateGroups>
-
-
+  <!-- TODO: We don't have an equivalent for this afaik. -->
+  <!-- <VisualState x:Name="FocusDisengaged" />
+  <VisualState x:Name="FocusEngagedHorizontal">
+    <Storyboard>
+      <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SliderContainer" Storyboard.TargetProperty="(Control.IsTemplateFocusTarget)">
+        <DiscreteObjectKeyFrame KeyTime="0" Value="False" />
+      </ObjectAnimationUsingKeyFrames>
+      <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HorizontalThumb" Storyboard.TargetProperty="(Control.IsTemplateFocusTarget)">
+        <DiscreteObjectKeyFrame KeyTime="0" Value="True" />
+      </ObjectAnimationUsingKeyFrames>
+    </Storyboard>
+  </VisualState>
+  <VisualState x:Name="FocusEngagedVertical">
+    <Storyboard>
+      <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SliderContainer" Storyboard.TargetProperty="(Control.IsTemplateFocusTarget)">
+        <DiscreteObjectKeyFrame KeyTime="0" Value="False" />
+      </ObjectAnimationUsingKeyFrames>
+      <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalThumb" Storyboard.TargetProperty="(Control.IsTemplateFocusTarget)">
+        <DiscreteObjectKeyFrame KeyTime="0" Value="True" />
+      </ObjectAnimationUsingKeyFrames>
+    </Storyboard>
+     -->
 
   <Style Selector="Slider">
     <Setter Property="Background" Value="{DynamicResource SliderTrackFill}" />
@@ -186,71 +151,72 @@
                 </Setter>
               </Style>
             </Grid.Resources>
-
             <Grid.RowDefinitions>
               <RowDefinition Height="Auto" />
               <RowDefinition Height="*" />
             </Grid.RowDefinitions>
-
-            <ContentPresenter x:Name="HeaderContentPresenter" Grid.Row="0" Content="{TemplateBinding Header}" ContentTemplate="{TemplateBinding HeaderTemplate}" FontWeight="{DynamicResource SliderHeaderThemeFontWeight}" Foreground="{DynamicResource SliderHeaderForeground}" Margin="{DynamicResource SliderTopHeaderMargin}" TextWrapping="Wrap" Visibility="Collapsed" x:DeferLoadStrategy="Lazy"/>
+            <ContentPresenter x:Name="HeaderContentPresenter" Grid.Row="0" Content="{TemplateBinding Header}" ContentTemplate="{TemplateBinding HeaderTemplate}" FontWeight="{DynamicResource SliderHeaderThemeFontWeight}"
+            Foreground="{DynamicResource SliderHeaderForeground}" Margin="{DynamicResource SliderTopHeaderMargin}" TextWrapping="Wrap" Visibility="Collapsed" x:DeferLoadStrategy="Lazy" />
             <Grid x:Name="SliderContainer" Grid.Row="1" Background="{DynamicResource SliderContainerBackground}" Control.IsTemplateFocusTarget="True">
               <Grid x:Name="HorizontalTemplate" MinHeight="{DynamicResource SliderHorizontalHeight}">
-
                 <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="Auto" />
                   <ColumnDefinition Width="Auto" />
                   <ColumnDefinition Width="*" />
                 </Grid.ColumnDefinitions>
-
                 <Grid.RowDefinitions>
                   <RowDefinition Height="{DynamicResource SliderPreContentMargin}" />
                   <RowDefinition Height="Auto" />
                   <RowDefinition Height="{DynamicResource SliderPostContentMargin}" />
                 </Grid.RowDefinitions>
-
-                <Rectangle x:Name="HorizontalTrackRect" Fill="{TemplateBinding Background}" Height="{DynamicResource SliderTrackThemeHeight}" Grid.Row="1" Grid.ColumnSpan="3" contract7Present:RadiusX="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7Present:RadiusY="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusX="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusY="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" />
-                <Rectangle x:Name="HorizontalDecreaseRect" Fill="{TemplateBinding Foreground}" Grid.Row="1" contract7Present:RadiusX="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7Present:RadiusY="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusX="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusY="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" />
+                <Rectangle x:Name="HorizontalTrackRect" Fill="{TemplateBinding Background}" Height="{DynamicResource SliderTrackThemeHeight}" Grid.Row="1" Grid.ColumnSpan="3"
+                contract7Present:RadiusX="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}"
+                contract7Present:RadiusY="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}"
+                contract7NotPresent:RadiusX="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}"
+                contract7NotPresent:RadiusY="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" />
+                <Rectangle x:Name="HorizontalDecreaseRect" Fill="{TemplateBinding Foreground}" Grid.Row="1"
+                contract7Present:RadiusX="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}"
+                contract7Present:RadiusY="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}"
+                contract7NotPresent:RadiusX="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}"
+                contract7NotPresent:RadiusY="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" />
                 <TickBar x:Name="TopTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderTickBarFill}" Height="{DynamicResource SliderOutsideTickBarThemeHeight}" VerticalAlignment="Bottom" Margin="0,0,0,4" Grid.ColumnSpan="3" />
                 <TickBar x:Name="HorizontalInlineTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderInlineTickBarFill}" Height="{DynamicResource SliderTrackThemeHeight}" Grid.Row="1" Grid.ColumnSpan="3" />
                 <TickBar x:Name="BottomTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderTickBarFill}" Height="{DynamicResource SliderOutsideTickBarThemeHeight}" VerticalAlignment="Top" Margin="0,4,0,0" Grid.Row="2" Grid.ColumnSpan="3" />
-                <Thumb x:Name="HorizontalThumb" Style="{StaticResource SliderThumbStyle}" DataContext="{TemplateBinding Value}" Height="{DynamicResource SliderHorizontalThumbHeight}" Width="{DynamicResource SliderHorizontalThumbWidth}" Grid.Row="0" Grid.RowSpan="3" Grid.Column="1" FocusVisualMargin="-14,-6,-14,-6" AutomationProperties.AccessibilityView="Raw" />
+                <Thumb x:Name="HorizontalThumb" Style="{StaticResource SliderThumbStyle}" DataContext="{TemplateBinding Value}" Height="{DynamicResource SliderHorizontalThumbHeight}" Width="{DynamicResource SliderHorizontalThumbWidth}" Grid.Row="0"
+                Grid.RowSpan="3" Grid.Column="1" FocusVisualMargin="-14,-6,-14,-6" AutomationProperties.AccessibilityView="Raw" />
               </Grid>
               <Grid x:Name="VerticalTemplate" MinWidth="{DynamicResource SliderVerticalWidth}" Visibility="Collapsed">
-
                 <Grid.RowDefinitions>
                   <RowDefinition Height="*" />
                   <RowDefinition Height="Auto" />
                   <RowDefinition Height="Auto" />
                 </Grid.RowDefinitions>
-
                 <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="{DynamicResource SliderPreContentMargin}" />
                   <ColumnDefinition Width="Auto" />
                   <ColumnDefinition Width="{DynamicResource SliderPostContentMargin}" />
                 </Grid.ColumnDefinitions>
-
-                <Rectangle x:Name="VerticalTrackRect" Fill="{TemplateBinding Background}" Width="{DynamicResource SliderTrackThemeHeight}" Grid.Column="1" Grid.RowSpan="3" contract7Present:RadiusX="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7Present:RadiusY="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusX="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusY="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" />
-                <Rectangle x:Name="VerticalDecreaseRect" Fill="{TemplateBinding Foreground}" Grid.Column="1" Grid.Row="2" contract7Present:RadiusX="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7Present:RadiusY="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusX="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusY="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" />
+                <Rectangle x:Name="VerticalTrackRect" Fill="{TemplateBinding Background}" Width="{DynamicResource SliderTrackThemeHeight}" Grid.Column="1" Grid.RowSpan="3"
+                contract7Present:RadiusX="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}"
+                contract7Present:RadiusY="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}"
+                contract7NotPresent:RadiusX="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}"
+                contract7NotPresent:RadiusY="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" />
+                <Rectangle x:Name="VerticalDecreaseRect" Fill="{TemplateBinding Foreground}" Grid.Column="1" Grid.Row="2"
+                contract7Present:RadiusX="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}"
+                contract7Present:RadiusY="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}"
+                contract7NotPresent:RadiusX="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}"
+                contract7NotPresent:RadiusY="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" />
                 <TickBar x:Name="LeftTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderTickBarFill}" Width="{DynamicResource SliderOutsideTickBarThemeHeight}" HorizontalAlignment="Right" Margin="0,0,4,0" Grid.RowSpan="3" />
                 <TickBar x:Name="VerticalInlineTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderInlineTickBarFill}" Width="{DynamicResource SliderTrackThemeHeight}" Grid.Column="1" Grid.RowSpan="3" />
-                <TickBar x:Name="RightTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderTickBarFill}" Width="{DynamicResource SliderOutsideTickBarThemeHeight}" HorizontalAlignment="Left" Margin="4,0,0,0" Grid.Column="2" Grid.RowSpan="3" />
-                <Thumb x:Name="VerticalThumb" Style="{StaticResource SliderThumbStyle}" DataContext="{TemplateBinding Value}" Width="{DynamicResource SliderVerticalThumbWidth}" Height="{DynamicResource SliderVerticalThumbHeight}" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="3" FocusVisualMargin="-6,-14,-6,-14" AutomationProperties.AccessibilityView="Raw" />
+                <TickBar x:Name="RightTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderTickBarFill}" Width="{DynamicResource SliderOutsideTickBarThemeHeight}" HorizontalAlignment="Left" Margin="4,0,0,0" Grid.Column="2"
+                Grid.RowSpan="3" />
+                <Thumb x:Name="VerticalThumb" Style="{StaticResource SliderThumbStyle}" DataContext="{TemplateBinding Value}" Width="{DynamicResource SliderVerticalThumbWidth}" Height="{DynamicResource SliderVerticalThumbHeight}" Grid.Row="1"
+                Grid.Column="0" Grid.ColumnSpan="3" FocusVisualMargin="-6,-14,-6,-14" AutomationProperties.AccessibilityView="Raw" />
               </Grid>
-
             </Grid>
-
           </Grid>
-
         </ControlTemplate>
       </Setter.Value>
     </Setter>
   </Style>
-
 </Styles>
-
-
-
-
-
-
-    

From f255f2685e0eba530b4b0f8bcc0b77eb0c94ce49 Mon Sep 17 00:00:00 2001
From: Jumar Macato <hikari.netto23@gmail.com>
Date: Thu, 28 May 2020 15:13:32 +0800
Subject: [PATCH 05/45] try making slider work

---
 src/Avalonia.Controls/Slider.cs               |  15 +-
 src/Avalonia.Themes.Fluent/Slider.xaml        | 207 +++++++++---------
 src/Avalonia.Visuals/Media/Color.cs           |   2 +
 .../Media/ColorToSolidColorBrushConverter.cs  |  36 +++
 4 files changed, 148 insertions(+), 112 deletions(-)
 create mode 100644 src/Avalonia.Visuals/Media/ColorToSolidColorBrushConverter.cs

diff --git a/src/Avalonia.Controls/Slider.cs b/src/Avalonia.Controls/Slider.cs
index e92c8faf20..9faf77d445 100644
--- a/src/Avalonia.Controls/Slider.cs
+++ b/src/Avalonia.Controls/Slider.cs
@@ -94,9 +94,18 @@ namespace Avalonia.Controls
                 _increaseButton.Click -= IncreaseClick;
             }
 
-            _decreaseButton = e.NameScope.Find<Button>("PART_DecreaseButton");
-            _track = e.NameScope.Find<Track>("PART_Track");
-            _increaseButton = e.NameScope.Find<Button>("PART_IncreaseButton");
+            // _decreaseButton = e.NameScope.Find<Button>("PART_DecreaseButton");
+
+            if (Orientation == Orientation.Horizontal)
+            {
+                _track = e.NameScope.Find<Track>("HorizontalThumb");
+            }
+            else
+            {
+                _track = e.NameScope.Find<Track>("VerticalThumb");
+            }
+
+            // _increaseButton = e.NameScope.Find<Button>("PART_IncreaseButton");
 
             if (_decreaseButton != null)
             {
diff --git a/src/Avalonia.Themes.Fluent/Slider.xaml b/src/Avalonia.Themes.Fluent/Slider.xaml
index 014095b924..523619fc5f 100644
--- a/src/Avalonia.Themes.Fluent/Slider.xaml
+++ b/src/Avalonia.Themes.Fluent/Slider.xaml
@@ -5,28 +5,27 @@
     <x:Double x:Key="SliderPostContentMargin">15</x:Double>
     <x:Double x:Key="SliderHorizontalHeight">32</x:Double>
     <x:Double x:Key="SliderVerticalWidth">32</x:Double>
-    <x:Double x:Key="SliderThumbCornerRadius">10</x:Double>
+    <Thickness x:Key="SliderThumbCornerRadius">10</Thickness>
     <x:Double x:Key="SliderHorizontalThumbWidth">20</x:Double>
     <x:Double x:Key="SliderHorizontalThumbHeight">20</x:Double>
     <x:Double x:Key="SliderVerticalThumbWidth">20</x:Double>
     <x:Double x:Key="SliderVerticalThumbHeight">20</x:Double>
   </Styles.Resources>
-  
   <!-- Disabled State -->
-  <Style Selector="Slider:disabled /template/ ContentPresenter#HeaderContentPresenter">
+  <!-- <Style Selector="Slider:disabled /template/ ContentPresenter#HeaderContentPresenter">
     <Setter Property="Foreground" Value="{DynamicResource SliderHeaderForegroundDisabled}" />
+  </Style> -->
+  <Style Selector="Slider:disabled /template/ Border#HorizontalDecreaseRect">
+    <Setter Property="Background" Value="{DynamicResource SliderTrackValueFillDisabled}" />
   </Style>
-  <Style Selector="Slider:disabled /template/ Rectangle#HorizontalDecreaseRect">
-    <Setter Property="Fill" Value="{DynamicResource SliderTrackValueFillDisabled}" />
+  <Style Selector="Slider:disabled /template/ Border#HorizontalTrackRect">
+    <Setter Property="Background" Value="{DynamicResource SliderTrackFillDisabled}" />
   </Style>
-  <Style Selector="Slider:disabled /template/ Rectangle#HorizontalTrackRect">
-    <Setter Property="Fill" Value="{DynamicResource SliderTrackFillDisabled}" />
+  <Style Selector="Slider:disabled /template/ Border#VerticalDecreaseRect">
+    <Setter Property="Background" Value="{DynamicResource SliderTrackValueFillDisabled}" />
   </Style>
-  <Style Selector="Slider:disabled /template/ Rectangle#VerticalDecreaseRect">
-    <Setter Property="Fill" Value="{DynamicResource SliderTrackValueFillDisabled}" />
-  </Style>
-  <Style Selector="Slider:disabled /template/ Rectangle#VerticalTrackRect">
-    <Setter Property="Fill" Value="{DynamicResource SliderTrackFillDisabled}" />
+  <Style Selector="Slider:disabled /template/ Border#VerticalTrackRect">
+    <Setter Property="Background" Value="{DynamicResource SliderTrackFillDisabled}" />
   </Style>
   <Style Selector="Slider:disabled /template/ Thumb#HorizontalThumb">
     <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundDisabled}" />
@@ -34,7 +33,7 @@
   <Style Selector="Slider:disabled /template/ Thumb#VerticalThumb">
     <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundDisabled}" />
   </Style>
-  <Style Selector="Slider:disabled /template/ TickBar#TopTickBar">
+  <!-- <Style Selector="Slider:disabled /template/ TickBar#TopTickBar">
     <Setter Property="Background" Value="{DynamicResource SliderTickBarFillDisabled}" />
   </Style>
   <Style Selector="Slider:disabled /template/ TickBar#BottomTickBar">
@@ -45,19 +44,18 @@
   </Style>
   <Style Selector="Slider:disabled /template/ TickBar#RightTickBar">
     <Setter Property="Background" Value="{DynamicResource SliderTickBarFillDisabled}" />
-  </Style>
+  </Style> -->
   <Style Selector="Slider:disabled /template/ Grid#SliderContainer">
     <Setter Property="Background" Value="{DynamicResource SliderContainerBackgroundDisabled}" />
   </Style>
-  
   <!-- Pressed State -->
-  <Style Selector="Slider:pressed /template/ Rectangle#HorizontalTrackRect">
-    <Setter Property="Fill" Value="{DynamicResource SliderTrackFillPressed}" />
+  <Style Selector="Slider:pressed /template/ Border#HorizontalTrackRect">
+    <Setter Property="Background" Value="{DynamicResource SliderTrackFillPressed}" />
   </Style>
-  <Style Selector="Slider:pressed /template/ Rectangle#HorizontalTrackRect">
-    <Setter Property="Fill" Value="{DynamicResource SliderTrackFillPressed}" />
+  <Style Selector="Slider:pressed /template/ Border#HorizontalTrackRect">
+    <Setter Property="Background" Value="{DynamicResource SliderTrackFillPressed}" />
   </Style>
-  <Style Selector="Slider:pressed /template/ Rectangle#VerticalTrackRect">
+  <Style Selector="Slider:pressed /template/ Border#VerticalTrackRect">
     <Setter Property="Background" Value="{DynamicResource SliderTrackFillPressed}" />
   </Style>
   <Style Selector="Slider:pressed /template/ Thumb#HorizontalThumb">
@@ -69,19 +67,18 @@
   <Style Selector="Slider:pressed /template/ Grid#SliderContainer">
     <Setter Property="Background" Value="{DynamicResource SliderContainerBackgroundPressed}" />
   </Style>
-  <Style Selector="Slider:pressed /template/ Rectangle#HorizontalDecreaseRect">
-    <Setter Property="Fill" Value="{DynamicResource SliderTrackValueFillPressed}" />
+  <Style Selector="Slider:pressed /template/ Border#HorizontalDecreaseRect">
+    <Setter Property="Background" Value="{DynamicResource SliderTrackValueFillPressed}" />
   </Style>
-  <Style Selector="Slider:pressed /template/ Rectangle#VerticalDecreaseRect">
-    <Setter Property="Fill" Value="{DynamicResource SliderTrackValueFillPressed}" />
+  <Style Selector="Slider:pressed /template/ Border#VerticalDecreaseRect">
+    <Setter Property="Background" Value="{DynamicResource SliderTrackValueFillPressed}" />
   </Style>
-
   <!-- PointerOver State -->
-  <Style Selector="Slider:pointerover /template/ Rectangle#HorizontalTrackRect">
-    <Setter Property="Fill" Value="{DynamicResource SliderTrackFillPointerOver}" />
+  <Style Selector="Slider:pointerover /template/ Border#HorizontalTrackRect">
+    <Setter Property="Background" Value="{DynamicResource SliderTrackFillPointerOver}" />
   </Style>
-  <Style Selector="Slider:pointerover /template/ Rectangle#VerticalTrackRect">
-    <Setter Property="Fill" Value="{DynamicResource SliderTrackFillPointerOver}" />
+  <Style Selector="Slider:pointerover /template/ Border#VerticalTrackRect">
+    <Setter Property="Background" Value="{DynamicResource SliderTrackFillPointerOver}" />
   </Style>
   <Style Selector="Slider:pointerover /template/ Thumb#HorizontalThumb">
     <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundPointerOver}" />
@@ -92,16 +89,15 @@
   <Style Selector="Slider:pointerover /template/ Grid#SliderContainer">
     <Setter Property="Background" Value="{DynamicResource SliderContainerBackgroundPointerOver}" />
   </Style>
-  <Style Selector="Slider:pointerover /template/ Rectangle#HorizontalDecreaseRect">
-    <Setter Property="Fill" Value="{DynamicResource SliderTrackValueFillPointerOver}" />
+  <Style Selector="Slider:pointerover /template/ Border#HorizontalDecreaseRect">
+    <Setter Property="Background" Value="{DynamicResource SliderTrackValueFillPointerOver}" />
   </Style>
-  <Style Selector="Slider:pointerover /template/ Rectangle#VerticalDecreaseRect">
-    <Setter Property="Fill" Value="{DynamicResource SliderTrackValueFillPointerOver}" />
+  <Style Selector="Slider:pointerover /template/ Border#VerticalDecreaseRect">
+    <Setter Property="Background" Value="{DynamicResource SliderTrackValueFillPointerOver}" />
   </Style>
-
   <!-- TODO: We don't have an equivalent for this afaik. -->
-  <!-- <VisualState x:Name="FocusDisengaged" />
-  <VisualState x:Name="FocusEngagedHorizontal">
+  <!-- <VisualState Name="FocusDisengaged" />
+  <VisualState Name="FocusEngagedHorizontal">
     <Storyboard>
       <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SliderContainer" Storyboard.TargetProperty="(Control.IsTemplateFocusTarget)">
         <DiscreteObjectKeyFrame KeyTime="0" Value="False" />
@@ -111,7 +107,7 @@
       </ObjectAnimationUsingKeyFrames>
     </Storyboard>
   </VisualState>
-  <VisualState x:Name="FocusEngagedVertical">
+  <VisualState Name="FocusEngagedVertical">
     <Storyboard>
       <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SliderContainer" Storyboard.TargetProperty="(Control.IsTemplateFocusTarget)">
         <DiscreteObjectKeyFrame KeyTime="0" Value="False" />
@@ -120,7 +116,20 @@
         <DiscreteObjectKeyFrame KeyTime="0" Value="True" />
       </ObjectAnimationUsingKeyFrames>
     </Storyboard>
-     -->
+     --> 
+    
+  <Style Selector="Slider:vertical /template/ Grid#VerticalTemplate">
+    <Setter Property="IsVisible" Value="True" />
+  </Style>
+  <Style Selector="Slider:vertical /template/ Grid#HorizontalTemplate">
+    <Setter Property="IsVisible" Value="False" />
+  </Style>
+  <Style Selector="Slider:horizontal /template/ Grid#HorizontalTemplate">
+    <Setter Property="IsVisible" Value="True" />
+  </Style>
+  <Style Selector="Slider:horizontal /template/ Grid#VerticalTemplate">
+    <Setter Property="IsVisible" Value="False" />
+  </Style>
 
   <Style Selector="Slider">
     <Setter Property="Background" Value="{DynamicResource SliderTrackFill}" />
@@ -128,93 +137,73 @@
     <Setter Property="Foreground" Value="{DynamicResource SliderTrackValueFill}" />
     <Setter Property="FontFamily" Value="{DynamicResource ContentControlThemeFontFamily}" />
     <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-    <Setter Property="ManipulationMode" Value="None" />
+    <!-- TODO Non-existent properties in avalonia. -->
+    <!-- <Setter Property="ManipulationMode" Value="None" />
     <Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
     <Setter Property="FocusVisualMargin" Value="-7,0,-7,0" />
-    <Setter Property="IsFocusEngagementEnabled" Value="True" />
-    <!-- NOTE: This was a contract7Present:Setter, not sure if this is correct -->
-    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+    <Setter Property="IsFocusEngagementEnabled" Value="True" /> -->
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate>
-          <Grid Margin="{TemplateBinding Padding}">
-            <Grid.Resources>
-              <Style TargetType="Thumb" x:Key="SliderThumbStyle">
+          <Border Margin="{TemplateBinding Padding}" CornerRadius="{DynamicResource ControlCornerRadius}">
+            <Border.Styles>
+              <Style Selector="Thumb.SliderThumbStyle">
                 <Setter Property="BorderThickness" Value="0" />
                 <Setter Property="Background" Value="{DynamicResource SliderThumbBackground}" />
                 <Setter Property="Template">
                   <Setter.Value>
-                    <ControlTemplate TargetType="Thumb">
+                    <ControlTemplate>
                       <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{DynamicResource SliderThumbCornerRadius}" />
                     </ControlTemplate>
                   </Setter.Value>
                 </Setter>
               </Style>
-            </Grid.Resources>
-            <Grid.RowDefinitions>
-              <RowDefinition Height="Auto" />
-              <RowDefinition Height="*" />
-            </Grid.RowDefinitions>
-            <ContentPresenter x:Name="HeaderContentPresenter" Grid.Row="0" Content="{TemplateBinding Header}" ContentTemplate="{TemplateBinding HeaderTemplate}" FontWeight="{DynamicResource SliderHeaderThemeFontWeight}"
-            Foreground="{DynamicResource SliderHeaderForeground}" Margin="{DynamicResource SliderTopHeaderMargin}" TextWrapping="Wrap" Visibility="Collapsed" x:DeferLoadStrategy="Lazy" />
-            <Grid x:Name="SliderContainer" Grid.Row="1" Background="{DynamicResource SliderContainerBackground}" Control.IsTemplateFocusTarget="True">
-              <Grid x:Name="HorizontalTemplate" MinHeight="{DynamicResource SliderHorizontalHeight}">
-                <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
-                <Grid.RowDefinitions>
-                  <RowDefinition Height="{DynamicResource SliderPreContentMargin}" />
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="{DynamicResource SliderPostContentMargin}" />
-                </Grid.RowDefinitions>
-                <Rectangle x:Name="HorizontalTrackRect" Fill="{TemplateBinding Background}" Height="{DynamicResource SliderTrackThemeHeight}" Grid.Row="1" Grid.ColumnSpan="3"
-                contract7Present:RadiusX="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}"
-                contract7Present:RadiusY="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}"
-                contract7NotPresent:RadiusX="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}"
-                contract7NotPresent:RadiusY="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" />
-                <Rectangle x:Name="HorizontalDecreaseRect" Fill="{TemplateBinding Foreground}" Grid.Row="1"
-                contract7Present:RadiusX="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}"
-                contract7Present:RadiusY="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}"
-                contract7NotPresent:RadiusX="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}"
-                contract7NotPresent:RadiusY="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" />
-                <TickBar x:Name="TopTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderTickBarFill}" Height="{DynamicResource SliderOutsideTickBarThemeHeight}" VerticalAlignment="Bottom" Margin="0,0,0,4" Grid.ColumnSpan="3" />
-                <TickBar x:Name="HorizontalInlineTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderInlineTickBarFill}" Height="{DynamicResource SliderTrackThemeHeight}" Grid.Row="1" Grid.ColumnSpan="3" />
-                <TickBar x:Name="BottomTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderTickBarFill}" Height="{DynamicResource SliderOutsideTickBarThemeHeight}" VerticalAlignment="Top" Margin="0,4,0,0" Grid.Row="2" Grid.ColumnSpan="3" />
-                <Thumb x:Name="HorizontalThumb" Style="{StaticResource SliderThumbStyle}" DataContext="{TemplateBinding Value}" Height="{DynamicResource SliderHorizontalThumbHeight}" Width="{DynamicResource SliderHorizontalThumbWidth}" Grid.Row="0"
-                Grid.RowSpan="3" Grid.Column="1" FocusVisualMargin="-14,-6,-14,-6" AutomationProperties.AccessibilityView="Raw" />
-              </Grid>
-              <Grid x:Name="VerticalTemplate" MinWidth="{DynamicResource SliderVerticalWidth}" Visibility="Collapsed">
-                <Grid.RowDefinitions>
-                  <RowDefinition Height="*" />
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-                </Grid.RowDefinitions>
-                <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="{DynamicResource SliderPreContentMargin}" />
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="{DynamicResource SliderPostContentMargin}" />
-                </Grid.ColumnDefinitions>
-                <Rectangle x:Name="VerticalTrackRect" Fill="{TemplateBinding Background}" Width="{DynamicResource SliderTrackThemeHeight}" Grid.Column="1" Grid.RowSpan="3"
-                contract7Present:RadiusX="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}"
-                contract7Present:RadiusY="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}"
-                contract7NotPresent:RadiusX="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}"
-                contract7NotPresent:RadiusY="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" />
-                <Rectangle x:Name="VerticalDecreaseRect" Fill="{TemplateBinding Foreground}" Grid.Column="1" Grid.Row="2"
-                contract7Present:RadiusX="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}"
-                contract7Present:RadiusY="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}"
-                contract7NotPresent:RadiusX="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}"
-                contract7NotPresent:RadiusY="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" />
-                <TickBar x:Name="LeftTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderTickBarFill}" Width="{DynamicResource SliderOutsideTickBarThemeHeight}" HorizontalAlignment="Right" Margin="0,0,4,0" Grid.RowSpan="3" />
-                <TickBar x:Name="VerticalInlineTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderInlineTickBarFill}" Width="{DynamicResource SliderTrackThemeHeight}" Grid.Column="1" Grid.RowSpan="3" />
-                <TickBar x:Name="RightTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderTickBarFill}" Width="{DynamicResource SliderOutsideTickBarThemeHeight}" HorizontalAlignment="Left" Margin="4,0,0,0" Grid.Column="2"
-                Grid.RowSpan="3" />
-                <Thumb x:Name="VerticalThumb" Style="{StaticResource SliderThumbStyle}" DataContext="{TemplateBinding Value}" Width="{DynamicResource SliderVerticalThumbWidth}" Height="{DynamicResource SliderVerticalThumbHeight}" Grid.Row="1"
-                Grid.Column="0" Grid.ColumnSpan="3" FocusVisualMargin="-6,-14,-6,-14" AutomationProperties.AccessibilityView="Raw" />
+            </Border.Styles>
+            <Grid RowDefinitions="Auto,*">
+              <!-- TODO removed TextBlock.TextWrapping; bind Content -> Header and ContentTemplate -> HeaderTemplate -->
+              <ContentPresenter Name="HeaderContentPresenter" Grid.Row="0" TextBlock.FontWeight="{DynamicResource SliderHeaderThemeFontWeight}" TextBlock.Foreground="{DynamicResource SliderHeaderForeground}" Margin="{DynamicResource SliderTopHeaderMargin}"
+              IsVisible="False" />
+              <!-- TODO removed Control.IsTemplateFocusTarget -->
+              <Grid Name="SliderContainer" Grid.Row="1" Background="{DynamicResource SliderContainerBackground}">
+                <Grid Name="HorizontalTemplate" ColumnDefinitions="Auto,Auto,*" MinHeight="{DynamicResource SliderHorizontalHeight}">
+                  <Grid.RowDefinitions>
+                    <RowDefinition Height="{DynamicResource SliderPreContentMargin}" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="{DynamicResource SliderPostContentMargin}" />
+                  </Grid.RowDefinitions>
+                  <Border Name="HorizontalTrackRect" Background="{TemplateBinding Background}" Height="{DynamicResource SliderTrackThemeHeight}" Grid.Row="1" Grid.ColumnSpan="3" CornerRadius="{Binding CornerRadius}" />
+                  <Border Name="HorizontalDecreaseRect" Background="{TemplateBinding Foreground}" Grid.Row="1" CornerRadius="{Binding CornerRadius}" />
+                  <!-- TODO TickBars are not implemented yet. -->
+                  <!--
+                <TickBar Name="TopTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderTickBarFill}" Height="{DynamicResource SliderOutsideTickBarThemeHeight}" VerticalAlignment="Bottom" Margin="0,0,0,4" Grid.ColumnSpan="3" />
+                <TickBar Name="HorizontalInlineTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderInlineTickBarFill}" Height="{DynamicResource SliderTrackThemeHeight}" Grid.Row="1" Grid.ColumnSpan="3" />
+                <TickBar Name="BottomTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderTickBarFill}" Height="{DynamicResource SliderOutsideTickBarThemeHeight}" VerticalAlignment="Top" Margin="0,4,0,0" Grid.Row="2" Grid.ColumnSpan="3" />
+                -->
+                  <!-- TODO Removed FocusVisualMargin and AutomationProperties.AccessibilityView -->
+                  <Thumb Name="HorizontalThumb" Classes="SliderThumbStyle" DataContext="{TemplateBinding Value}" Height="{DynamicResource SliderHorizontalThumbHeight}" Width="{DynamicResource SliderHorizontalThumbWidth}" Grid.Row="0"
+                  Grid.RowSpan="3" Grid.Column="1" />
+                </Grid>
+                <Grid Name="VerticalTemplate" RowDefinitions="*,Auto,Auto" MinWidth="{DynamicResource SliderVerticalWidth}" IsVisible="False">
+                  <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="{DynamicResource SliderPreContentMargin}" />
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="{DynamicResource SliderPostContentMargin}" />
+                  </Grid.ColumnDefinitions>
+                  <Border Name="VerticalTrackRect" Background="{TemplateBinding Background}" Width="{DynamicResource SliderTrackThemeHeight}" Grid.Column="1" Grid.RowSpan="3" CornerRadius="{Binding CornerRadius}" />
+                  <Border Name="VerticalDecreaseRect" Background="{TemplateBinding Foreground}" Grid.Column="1" Grid.Row="2" CornerRadius="{Binding CornerRadius}" />
+                  <!-- TODO TickBars are not implemented yet. -->
+                  <!-- 
+                <TickBar Name="LeftTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderTickBarFill}" Width="{DynamicResource SliderOutsideTickBarThemeHeight}" HorizontalAlignment="Right" Margin="0,0,4,0" Grid.RowSpan="3" />
+                <TickBar Name="VerticalInlineTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderInlineTickBarFill}" Width="{DynamicResource SliderTrackThemeHeight}" Grid.Column="1" Grid.RowSpan="3" />
+                <TickBar Name="RightTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderTickBarFill}" Width="{DynamicResource SliderOutsideTickBarThemeHeight}" HorizontalAlignment="Left" Margin="4,0,0,0" Grid.Column="2" Grid.RowSpan="3" /> 
+                -->
+                  <!-- TODO Removed FocusVisualMargin and AutomationProperties.AccessibilityView-->
+                  <Thumb Name="VerticalThumb" Classes="SliderThumbStyle" DataContext="{TemplateBinding Value}" Width="{DynamicResource SliderVerticalThumbWidth}" Height="{DynamicResource SliderVerticalThumbHeight}" Grid.Row="1" Grid.Column="0"
+                  Grid.ColumnSpan="3" />
+                </Grid>
               </Grid>
             </Grid>
-          </Grid>
+          </Border>
         </ControlTemplate>
       </Setter.Value>
     </Setter>
diff --git a/src/Avalonia.Visuals/Media/Color.cs b/src/Avalonia.Visuals/Media/Color.cs
index 2e06d2578f..acacbaac36 100644
--- a/src/Avalonia.Visuals/Media/Color.cs
+++ b/src/Avalonia.Visuals/Media/Color.cs
@@ -1,4 +1,5 @@
 using System;
+using System.ComponentModel;
 using System.Globalization;
 using Avalonia.Animation.Animators;
 
@@ -7,6 +8,7 @@ namespace Avalonia.Media
     /// <summary>
     /// An ARGB color.
     /// </summary>
+    [TypeConverter(typeof(ColorToSolidColorBrushConverter))]
     public readonly struct Color : IEquatable<Color>
     {
         static Color()
diff --git a/src/Avalonia.Visuals/Media/ColorToSolidColorBrushConverter.cs b/src/Avalonia.Visuals/Media/ColorToSolidColorBrushConverter.cs
new file mode 100644
index 0000000000..fa8603c536
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/ColorToSolidColorBrushConverter.cs
@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Globalization;
+using System.Linq;
+using Avalonia.Media.Immutable;
+
+namespace Avalonia.Media
+{
+    internal class ColorToSolidColorBrushConverter : TypeConverter
+    {
+        public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
+        {
+            return sourceType == typeof(string);
+        }
+
+        public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
+        {
+            return Color.Parse((string)value);
+        }
+        public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType)
+        {
+            return typeof(IBrush).IsAssignableFrom(destinationType);
+        }
+
+        public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            if (typeof(IBrush).IsAssignableFrom(destinationType))
+            {
+                return new ImmutableSolidColorBrush((Color)value);
+            }
+
+            return null;
+        }
+    }
+}
\ No newline at end of file

From a64adf28d696ff40d2ab2a1d041c9ca812200b42 Mon Sep 17 00:00:00 2001
From: Jumar Macato <hikari.netto23@gmail.com>
Date: Thu, 28 May 2020 16:21:37 +0800
Subject: [PATCH 06/45] fixes

---
 src/Avalonia.Controls/Slider.cs        | 4 ++--
 src/Avalonia.Themes.Fluent/Slider.xaml | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/Avalonia.Controls/Slider.cs b/src/Avalonia.Controls/Slider.cs
index 9faf77d445..b7a571af18 100644
--- a/src/Avalonia.Controls/Slider.cs
+++ b/src/Avalonia.Controls/Slider.cs
@@ -98,11 +98,11 @@ namespace Avalonia.Controls
 
             if (Orientation == Orientation.Horizontal)
             {
-                _track = e.NameScope.Find<Track>("HorizontalThumb");
+                // _track = e.NameScope.Find<Track>("HorizontalThumb");
             }
             else
             {
-                _track = e.NameScope.Find<Track>("VerticalThumb");
+                // _track = e.NameScope.Find<Track>("VerticalThumb");
             }
 
             // _increaseButton = e.NameScope.Find<Button>("PART_IncreaseButton");
diff --git a/src/Avalonia.Themes.Fluent/Slider.xaml b/src/Avalonia.Themes.Fluent/Slider.xaml
index 523619fc5f..b790271dc0 100644
--- a/src/Avalonia.Themes.Fluent/Slider.xaml
+++ b/src/Avalonia.Themes.Fluent/Slider.xaml
@@ -5,7 +5,7 @@
     <x:Double x:Key="SliderPostContentMargin">15</x:Double>
     <x:Double x:Key="SliderHorizontalHeight">32</x:Double>
     <x:Double x:Key="SliderVerticalWidth">32</x:Double>
-    <Thickness x:Key="SliderThumbCornerRadius">10</Thickness>
+    <CornerRadius x:Key="SliderThumbCornerRadius">10</>
     <x:Double x:Key="SliderHorizontalThumbWidth">20</x:Double>
     <x:Double x:Key="SliderHorizontalThumbHeight">20</x:Double>
     <x:Double x:Key="SliderVerticalThumbWidth">20</x:Double>
@@ -95,6 +95,7 @@
   <Style Selector="Slider:pointerover /template/ Border#VerticalDecreaseRect">
     <Setter Property="Background" Value="{DynamicResource SliderTrackValueFillPointerOver}" />
   </Style>
+  
   <!-- TODO: We don't have an equivalent for this afaik. -->
   <!-- <VisualState Name="FocusDisengaged" />
   <VisualState Name="FocusEngagedHorizontal">
@@ -183,7 +184,7 @@
                   <Thumb Name="HorizontalThumb" Classes="SliderThumbStyle" DataContext="{TemplateBinding Value}" Height="{DynamicResource SliderHorizontalThumbHeight}" Width="{DynamicResource SliderHorizontalThumbWidth}" Grid.Row="0"
                   Grid.RowSpan="3" Grid.Column="1" />
                 </Grid>
-                <Grid Name="VerticalTemplate" RowDefinitions="*,Auto,Auto" MinWidth="{DynamicResource SliderVerticalWidth}" IsVisible="False">
+                <Grid Name="VerticalTemplate" RowDefinitions="*,Auto,Auto" MinWidth="{DynamicResource SliderVerticalWidth}">
                   <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="{DynamicResource SliderPreContentMargin}" />
                     <ColumnDefinition Width="Auto" />

From 5da012690120a80e91a0f133cadc4619c962b747 Mon Sep 17 00:00:00 2001
From: Jumar Macato <hikari.netto23@gmail.com>
Date: Thu, 28 May 2020 18:35:40 +0800
Subject: [PATCH 07/45] fix

---
 src/Avalonia.Themes.Fluent/Slider.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Themes.Fluent/Slider.xaml b/src/Avalonia.Themes.Fluent/Slider.xaml
index b790271dc0..b4a0eee98a 100644
--- a/src/Avalonia.Themes.Fluent/Slider.xaml
+++ b/src/Avalonia.Themes.Fluent/Slider.xaml
@@ -5,7 +5,7 @@
     <x:Double x:Key="SliderPostContentMargin">15</x:Double>
     <x:Double x:Key="SliderHorizontalHeight">32</x:Double>
     <x:Double x:Key="SliderVerticalWidth">32</x:Double>
-    <CornerRadius x:Key="SliderThumbCornerRadius">10</>
+    <CornerRadius x:Key="SliderThumbCornerRadius">10</CornerRadius>
     <x:Double x:Key="SliderHorizontalThumbWidth">20</x:Double>
     <x:Double x:Key="SliderHorizontalThumbHeight">20</x:Double>
     <x:Double x:Key="SliderVerticalThumbWidth">20</x:Double>

From 1b6ef94e70537e74c050e93092eb55e611c4026f Mon Sep 17 00:00:00 2001
From: Jumar Macato <hikari.netto23@gmail.com>
Date: Thu, 28 May 2020 21:41:09 +0800
Subject: [PATCH 08/45] remove hacks

---
 src/Avalonia.Visuals/Media/Color.cs           |  1 -
 .../Media/ColorToSolidColorBrushConverter.cs  | 36 -------------------
 2 files changed, 37 deletions(-)
 delete mode 100644 src/Avalonia.Visuals/Media/ColorToSolidColorBrushConverter.cs

diff --git a/src/Avalonia.Visuals/Media/Color.cs b/src/Avalonia.Visuals/Media/Color.cs
index acacbaac36..85808698f9 100644
--- a/src/Avalonia.Visuals/Media/Color.cs
+++ b/src/Avalonia.Visuals/Media/Color.cs
@@ -8,7 +8,6 @@ namespace Avalonia.Media
     /// <summary>
     /// An ARGB color.
     /// </summary>
-    [TypeConverter(typeof(ColorToSolidColorBrushConverter))]
     public readonly struct Color : IEquatable<Color>
     {
         static Color()
diff --git a/src/Avalonia.Visuals/Media/ColorToSolidColorBrushConverter.cs b/src/Avalonia.Visuals/Media/ColorToSolidColorBrushConverter.cs
deleted file mode 100644
index fa8603c536..0000000000
--- a/src/Avalonia.Visuals/Media/ColorToSolidColorBrushConverter.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Globalization;
-using System.Linq;
-using Avalonia.Media.Immutable;
-
-namespace Avalonia.Media
-{
-    internal class ColorToSolidColorBrushConverter : TypeConverter
-    {
-        public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
-        {
-            return sourceType == typeof(string);
-        }
-
-        public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
-        {
-            return Color.Parse((string)value);
-        }
-        public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType)
-        {
-            return typeof(IBrush).IsAssignableFrom(destinationType);
-        }
-
-        public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
-        {
-            if (typeof(IBrush).IsAssignableFrom(destinationType))
-            {
-                return new ImmutableSolidColorBrush((Color)value);
-            }
-
-            return null;
-        }
-    }
-}
\ No newline at end of file

From bd1e8b315b4fc86fa859f592e3bbdbd18e6ee40d Mon Sep 17 00:00:00 2001
From: Jumar Macato <hikari.netto23@gmail.com>
Date: Thu, 28 May 2020 21:51:23 +0800
Subject: [PATCH 09/45] addtional things

---
 src/Avalonia.Themes.Fluent/Slider.xaml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Slider.xaml b/src/Avalonia.Themes.Fluent/Slider.xaml
index b4a0eee98a..bb7a4cda8e 100644
--- a/src/Avalonia.Themes.Fluent/Slider.xaml
+++ b/src/Avalonia.Themes.Fluent/Slider.xaml
@@ -1,8 +1,8 @@
 <Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <Styles.Resources>
     <Thickness x:Key="SliderTopHeaderMargin">0,0,0,4</Thickness>
-    <x:Double x:Key="SliderPreContentMargin">15</x:Double>
-    <x:Double x:Key="SliderPostContentMargin">15</x:Double>
+    <GridLength x:Key="SliderPreContentMargin">15</GridLength>
+    <GridLength x:Key="SliderPostContentMargin">15</GridLength>
     <x:Double x:Key="SliderHorizontalHeight">32</x:Double>
     <x:Double x:Key="SliderVerticalWidth">32</x:Double>
     <CornerRadius x:Key="SliderThumbCornerRadius">10</CornerRadius>
@@ -27,10 +27,10 @@
   <Style Selector="Slider:disabled /template/ Border#VerticalTrackRect">
     <Setter Property="Background" Value="{DynamicResource SliderTrackFillDisabled}" />
   </Style>
-  <Style Selector="Slider:disabled /template/ Thumb#HorizontalThumb">
+  <Style Selector="Slider:disabled /template/ Thumb#HorizontalThumb /template/ Border">
     <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundDisabled}" />
   </Style>
-  <Style Selector="Slider:disabled /template/ Thumb#VerticalThumb">
+  <Style Selector="Slider:disabled /template/ Thumb#VerticalThumb /template/ Border">
     <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundDisabled}" />
   </Style>
   <!-- <Style Selector="Slider:disabled /template/ TickBar#TopTickBar">
@@ -58,10 +58,10 @@
   <Style Selector="Slider:pressed /template/ Border#VerticalTrackRect">
     <Setter Property="Background" Value="{DynamicResource SliderTrackFillPressed}" />
   </Style>
-  <Style Selector="Slider:pressed /template/ Thumb#HorizontalThumb">
+  <Style Selector="Slider:pressed /template/ Thumb#HorizontalThumb /template/ Border">
     <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundPressed}" />
   </Style>
-  <Style Selector="Slider:pressed /template/ Thumb#VerticalThumb">
+  <Style Selector="Slider:pressed /template/ Thumb#VerticalThumb /template/ Border">
     <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundPressed}" />
   </Style>
   <Style Selector="Slider:pressed /template/ Grid#SliderContainer">
@@ -80,10 +80,10 @@
   <Style Selector="Slider:pointerover /template/ Border#VerticalTrackRect">
     <Setter Property="Background" Value="{DynamicResource SliderTrackFillPointerOver}" />
   </Style>
-  <Style Selector="Slider:pointerover /template/ Thumb#HorizontalThumb">
+  <Style Selector="Slider:pointerover /template/ Thumb#HorizontalThumb /template/ Border">
     <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundPointerOver}" />
   </Style>
-  <Style Selector="Slider:pointerover /template/ Thumb#VerticalThumb">
+  <Style Selector="Slider:pointerover /template/ Thumb#VerticalThumb /template/ Border">
     <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundPointerOver}" />
   </Style>
   <Style Selector="Slider:pointerover /template/ Grid#SliderContainer">

From 9382c07609fc84bc3b97957f5b6aa43f5b149314 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Thu, 28 May 2020 19:51:50 -0300
Subject: [PATCH 10/45] re-order resources

---
 .../Accents/FluentBaseDark.xaml               | 105 +++++++++---------
 .../Accents/FluentBaseLight.xaml              | 105 +++++++++---------
 .../Accents/FluentControlResourcesDark.xaml   |  91 +++++++--------
 .../Accents/FluentControlResourcesLight.xaml  |  91 +++++++--------
 4 files changed, 198 insertions(+), 194 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Accents/FluentBaseDark.xaml b/src/Avalonia.Themes.Fluent/Accents/FluentBaseDark.xaml
index e8e4c96786..ab4806d6cd 100644
--- a/src/Avalonia.Themes.Fluent/Accents/FluentBaseDark.xaml
+++ b/src/Avalonia.Themes.Fluent/Accents/FluentBaseDark.xaml
@@ -1,5 +1,5 @@
-<Style xmlns="https://github.com/avaloniaui" 
-  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
+<Style xmlns="https://github.com/avaloniaui"
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
   xmlns:sys="clr-namespace:System;assembly=netstandard">
   <Style.Resources>
     <Color x:Key="SystemAccentColor">#FF0078D7</Color>
@@ -85,56 +85,6 @@
     <StaticResource x:Key="ButtonBorderBrushPressed" ResourceKey="SystemControlHighlightTransparentBrush" />
     <StaticResource x:Key="ButtonBorderBrushDisabled" ResourceKey="SystemControlDisabledTransparentBrush" />
 
-    <!-- BaseResources for ListBox.xaml -->
-    <Thickness x:Key="ListBoxBorderThemeThickness">0</Thickness>
-    <SolidColorBrush x:Key="ListBoxBackgroundThemeBrush" Color="#CCFFFFFF" />
-    <SolidColorBrush x:Key="ListBoxBorderThemeBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="ListBoxDisabledForegroundThemeBrush" Color="#66FFFFFF" />
-    <SolidColorBrush x:Key="ListBoxFocusBackgroundThemeBrush" Color="#FFFFFFFF" />
-    <SolidColorBrush x:Key="ListBoxForegroundThemeBrush" Color="#FF000000" />
-    <SolidColorBrush x:Key="ListBoxItemDisabledForegroundThemeBrush" Color="#66FFFFFF" />
-    <SolidColorBrush x:Key="ListBoxItemPointerOverBackgroundThemeBrush" Color="#21000000" />
-    <SolidColorBrush x:Key="ListBoxItemPointerOverForegroundThemeBrush" Color="#FF000000" />
-    <SolidColorBrush x:Key="ListBoxItemPressedBackgroundThemeBrush" Color="#FFD3D3D3" />
-    <SolidColorBrush x:Key="ListBoxItemPressedForegroundThemeBrush" Color="#FF000000" />
-    <SolidColorBrush x:Key="ListBoxItemSelectedBackgroundThemeBrush" Color="#FF4617B4" />
-    <SolidColorBrush x:Key="ListBoxItemSelectedDisabledBackgroundThemeBrush" Color="#66FFFFFF" />
-    <SolidColorBrush x:Key="ListBoxItemSelectedDisabledForegroundThemeBrush" Color="#99000000" />
-    <SolidColorBrush x:Key="ListBoxItemSelectedForegroundThemeBrush" Color="White" />
-    <SolidColorBrush x:Key="ListBoxItemSelectedPointerOverBackgroundThemeBrush" Color="#FF5F37BE" />
-    
-    <!-- BaseResources for TextBox.xaml -->
-    <StaticResource x:Key="TextControlForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
-    <StaticResource x:Key="TextControlForegroundPointerOver" ResourceKey="SystemControlForegroundBaseHighBrush" />
-    <StaticResource x:Key="TextControlForegroundFocused" ResourceKey="SystemControlForegroundChromeBlackHighBrush" />
-    <StaticResource x:Key="TextControlForegroundDisabled" ResourceKey="SystemControlDisabledChromeDisabledLowBrush" />
-    <StaticResource x:Key="TextControlBackground" ResourceKey="SystemControlBackgroundAltMediumLowBrush" />
-    <StaticResource x:Key="TextControlBackgroundPointerOver" ResourceKey="SystemControlBackgroundAltMediumBrush" />
-    <StaticResource x:Key="TextControlBackgroundFocused" ResourceKey="SystemControlBackgroundChromeWhiteBrush" />
-    <StaticResource x:Key="TextControlBackgroundDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
-    <StaticResource x:Key="TextControlBorderBrush" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
-    <StaticResource x:Key="TextControlBorderBrushPointerOver" ResourceKey="SystemControlHighlightBaseMediumBrush" />
-    <StaticResource x:Key="TextControlBorderBrushFocused" ResourceKey="SystemControlHighlightAccentBrush" />
-    <StaticResource x:Key="TextControlBorderBrushDisabled" ResourceKey="SystemControlDisabledBaseLowBrush" />
-    <StaticResource x:Key="TextControlPlaceholderForeground" ResourceKey="SystemControlPageTextBaseMediumBrush" />
-    <StaticResource x:Key="TextControlPlaceholderForegroundPointerOver" ResourceKey="SystemControlPageTextBaseMediumBrush" />
-    <StaticResource x:Key="TextControlPlaceholderForegroundFocused" ResourceKey="SystemControlPageTextChromeBlackMediumLowBrush" />
-    <StaticResource x:Key="TextControlPlaceholderForegroundDisabled" ResourceKey="SystemControlDisabledChromeDisabledLowBrush" />
-    <StaticResource x:Key="TextControlHeaderForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
-    <StaticResource x:Key="TextControlHeaderForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
-    <StaticResource x:Key="TextControlSelectionHighlightColor" ResourceKey="SystemControlHighlightAccentBrush" />
-    <StaticResource x:Key="TextControlButtonBackground" ResourceKey="SystemControlTransparentBrush" />
-    <StaticResource x:Key="TextControlButtonBackgroundPointerOver" ResourceKey="SystemControlTransparentBrush" />
-    <StaticResource x:Key="TextControlButtonBackgroundPressed" ResourceKey="SystemControlHighlightAccentBrush" />
-    <StaticResource x:Key="TextControlButtonBorderBrush" ResourceKey="SystemControlTransparentBrush" />
-    <StaticResource x:Key="TextControlButtonBorderBrushPointerOver" ResourceKey="SystemControlTransparentBrush" />
-    <StaticResource x:Key="TextControlButtonBorderBrushPressed" ResourceKey="SystemControlTransparentBrush" />
-    <StaticResource x:Key="TextControlButtonForeground" ResourceKey="SystemControlForegroundChromeBlackMediumBrush" />
-    <StaticResource x:Key="TextControlButtonForegroundPointerOver" ResourceKey="SystemControlHighlightAccentBrush" />
-    <StaticResource x:Key="TextControlButtonForegroundPressed" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
-    <StaticResource x:Key="ContentLinkForegroundColor" ResourceKey="SystemControlHyperlinkTextBrush" />
-    <StaticResource x:Key="ContentLinkBackgroundColor" ResourceKey="SystemControlPageBackgroundChromeLowBrush" />
-
     <!-- BaseResources for CheckBox.xaml -->
     <StaticResource x:Key="CheckBoxForegroundUnchecked" ResourceKey="SystemControlForegroundBaseHighBrush" />
     <StaticResource x:Key="CheckBoxForegroundUncheckedPointerOver" ResourceKey="SystemControlForegroundBaseHighBrush" />
@@ -208,6 +158,25 @@
     <StaticResource x:Key="CheckBoxCheckGlyphForegroundIndeterminatePointerOver" ResourceKey="SystemControlForegroundBaseHighBrush" />
     <StaticResource x:Key="CheckBoxCheckGlyphForegroundIndeterminatePressed" ResourceKey="SystemControlForegroundBaseMediumBrush" />
     <StaticResource x:Key="CheckBoxCheckGlyphForegroundIndeterminateDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+
+    <!-- BaseResources for ListBox.xaml -->
+    <Thickness x:Key="ListBoxBorderThemeThickness">0</Thickness>
+    <SolidColorBrush x:Key="ListBoxBackgroundThemeBrush" Color="#CCFFFFFF" />
+    <SolidColorBrush x:Key="ListBoxBorderThemeBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="ListBoxDisabledForegroundThemeBrush" Color="#66FFFFFF" />
+    <SolidColorBrush x:Key="ListBoxFocusBackgroundThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="ListBoxForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="ListBoxItemDisabledForegroundThemeBrush" Color="#66FFFFFF" />
+    <SolidColorBrush x:Key="ListBoxItemPointerOverBackgroundThemeBrush" Color="#21000000" />
+    <SolidColorBrush x:Key="ListBoxItemPointerOverForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="ListBoxItemPressedBackgroundThemeBrush" Color="#FFD3D3D3" />
+    <SolidColorBrush x:Key="ListBoxItemPressedForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="ListBoxItemSelectedBackgroundThemeBrush" Color="#FF4617B4" />
+    <SolidColorBrush x:Key="ListBoxItemSelectedDisabledBackgroundThemeBrush" Color="#66FFFFFF" />
+    <SolidColorBrush x:Key="ListBoxItemSelectedDisabledForegroundThemeBrush" Color="#99000000" />
+    <SolidColorBrush x:Key="ListBoxItemSelectedForegroundThemeBrush" Color="White" />
+    <SolidColorBrush x:Key="ListBoxItemSelectedPointerOverBackgroundThemeBrush" Color="#FF5F37BE" />
+
     <!-- BaseResources for Slider.xaml -->
     <StaticResource x:Key="SliderContainerBackground" ResourceKey="SystemControlTransparentBrush" />
     <StaticResource x:Key="SliderContainerBackgroundPointerOver" ResourceKey="SystemControlTransparentBrush" />
@@ -230,5 +199,37 @@
     <StaticResource x:Key="SliderTickBarFill" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
     <StaticResource x:Key="SliderTickBarFillDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
     <StaticResource x:Key="SliderInlineTickBarFill" ResourceKey="SystemControlBackgroundAltHighBrush" />
+
+    <!-- BaseResources for TextBox.xaml -->
+    <StaticResource x:Key="TextControlForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="TextControlForegroundPointerOver" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="TextControlForegroundFocused" ResourceKey="SystemControlForegroundChromeBlackHighBrush" />
+    <StaticResource x:Key="TextControlForegroundDisabled" ResourceKey="SystemControlDisabledChromeDisabledLowBrush" />
+    <StaticResource x:Key="TextControlBackground" ResourceKey="SystemControlBackgroundAltMediumLowBrush" />
+    <StaticResource x:Key="TextControlBackgroundPointerOver" ResourceKey="SystemControlBackgroundAltMediumBrush" />
+    <StaticResource x:Key="TextControlBackgroundFocused" ResourceKey="SystemControlBackgroundChromeWhiteBrush" />
+    <StaticResource x:Key="TextControlBackgroundDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <StaticResource x:Key="TextControlBorderBrush" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
+    <StaticResource x:Key="TextControlBorderBrushPointerOver" ResourceKey="SystemControlHighlightBaseMediumBrush" />
+    <StaticResource x:Key="TextControlBorderBrushFocused" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="TextControlBorderBrushDisabled" ResourceKey="SystemControlDisabledBaseLowBrush" />
+    <StaticResource x:Key="TextControlPlaceholderForeground" ResourceKey="SystemControlPageTextBaseMediumBrush" />
+    <StaticResource x:Key="TextControlPlaceholderForegroundPointerOver" ResourceKey="SystemControlPageTextBaseMediumBrush" />
+    <StaticResource x:Key="TextControlPlaceholderForegroundFocused" ResourceKey="SystemControlPageTextChromeBlackMediumLowBrush" />
+    <StaticResource x:Key="TextControlPlaceholderForegroundDisabled" ResourceKey="SystemControlDisabledChromeDisabledLowBrush" />
+    <StaticResource x:Key="TextControlHeaderForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="TextControlHeaderForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="TextControlSelectionHighlightColor" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="TextControlButtonBackground" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="TextControlButtonBackgroundPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="TextControlButtonBackgroundPressed" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="TextControlButtonBorderBrush" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="TextControlButtonBorderBrushPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="TextControlButtonBorderBrushPressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="TextControlButtonForeground" ResourceKey="SystemControlForegroundChromeBlackMediumBrush" />
+    <StaticResource x:Key="TextControlButtonForegroundPointerOver" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="TextControlButtonForegroundPressed" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <StaticResource x:Key="ContentLinkForegroundColor" ResourceKey="SystemControlHyperlinkTextBrush" />
+    <StaticResource x:Key="ContentLinkBackgroundColor" ResourceKey="SystemControlPageBackgroundChromeLowBrush" />
   </Style.Resources>
 </Style>
diff --git a/src/Avalonia.Themes.Fluent/Accents/FluentBaseLight.xaml b/src/Avalonia.Themes.Fluent/Accents/FluentBaseLight.xaml
index b693df38f4..1d3e415e90 100644
--- a/src/Avalonia.Themes.Fluent/Accents/FluentBaseLight.xaml
+++ b/src/Avalonia.Themes.Fluent/Accents/FluentBaseLight.xaml
@@ -1,5 +1,5 @@
-<Style xmlns="https://github.com/avaloniaui" 
-  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
+<Style xmlns="https://github.com/avaloniaui"
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
   xmlns:sys="clr-namespace:System;assembly=netstandard">
   <Style.Resources>
     <Color x:Key="SystemAccentColor">#FF0078D7</Color>
@@ -86,56 +86,6 @@
     <StaticResource x:Key="ButtonBorderBrushPressed" ResourceKey="SystemControlHighlightTransparentBrush" />
     <StaticResource x:Key="ButtonBorderBrushDisabled" ResourceKey="SystemControlDisabledTransparentBrush" />
 
-    <!-- BaseResources for Listbox.xaml -->
-    <Thickness x:Key="ListBoxBorderThemeThickness">0</Thickness>
-    <SolidColorBrush x:Key="ListBoxBackgroundThemeBrush" Color="#CCFFFFFF" />
-    <SolidColorBrush x:Key="ListBoxBorderThemeBrush" Color="#45000000" />
-    <SolidColorBrush x:Key="ListBoxDisabledForegroundThemeBrush" Color="#66000000" />
-    <SolidColorBrush x:Key="ListBoxFocusBackgroundThemeBrush" Color="#FFFFFFFF" />
-    <SolidColorBrush x:Key="ListBoxForegroundThemeBrush" Color="#FF000000" />
-    <SolidColorBrush x:Key="ListBoxItemDisabledForegroundThemeBrush" Color="#66000000" />
-    <SolidColorBrush x:Key="ListBoxItemPointerOverBackgroundThemeBrush" Color="#21000000" />
-    <SolidColorBrush x:Key="ListBoxItemPointerOverForegroundThemeBrush" Color="#FF000000" />
-    <SolidColorBrush x:Key="ListBoxItemPressedBackgroundThemeBrush" Color="#FFD3D3D3" />
-    <SolidColorBrush x:Key="ListBoxItemPressedForegroundThemeBrush" Color="#FF000000" />
-    <SolidColorBrush x:Key="ListBoxItemSelectedBackgroundThemeBrush" Color="#FF4617B4" />
-    <SolidColorBrush x:Key="ListBoxItemSelectedDisabledBackgroundThemeBrush" Color="#8C000000" />
-    <SolidColorBrush x:Key="ListBoxItemSelectedDisabledForegroundThemeBrush" Color="#99FFFFFF" />
-    <SolidColorBrush x:Key="ListBoxItemSelectedForegroundThemeBrush" Color="White" />
-    <SolidColorBrush x:Key="ListBoxItemSelectedPointerOverBackgroundThemeBrush" Color="#FF5F37BE" />
-    
-    <!-- BaseResources for TextBox.xaml -->
-    <StaticResource x:Key="TextControlForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
-    <StaticResource x:Key="TextControlForegroundPointerOver" ResourceKey="SystemControlForegroundBaseHighBrush" />
-    <StaticResource x:Key="TextControlForegroundFocused" ResourceKey="SystemControlForegroundChromeBlackHighBrush" />
-    <StaticResource x:Key="TextControlForegroundDisabled" ResourceKey="SystemControlDisabledChromeDisabledLowBrush" />
-    <StaticResource x:Key="TextControlBackground" ResourceKey="SystemControlBackgroundAltMediumLowBrush" />
-    <StaticResource x:Key="TextControlBackgroundPointerOver" ResourceKey="SystemControlBackgroundAltMediumBrush" />
-    <StaticResource x:Key="TextControlBackgroundFocused" ResourceKey="SystemControlBackgroundChromeWhiteBrush" />
-    <StaticResource x:Key="TextControlBackgroundDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
-    <StaticResource x:Key="TextControlBorderBrush" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
-    <StaticResource x:Key="TextControlBorderBrushPointerOver" ResourceKey="SystemControlHighlightBaseMediumBrush" />
-    <StaticResource x:Key="TextControlBorderBrushFocused" ResourceKey="SystemControlHighlightAccentBrush" />
-    <StaticResource x:Key="TextControlBorderBrushDisabled" ResourceKey="SystemControlDisabledBaseLowBrush" />
-    <StaticResource x:Key="TextControlPlaceholderForeground" ResourceKey="SystemControlPageTextBaseMediumBrush" />
-    <StaticResource x:Key="TextControlPlaceholderForegroundPointerOver" ResourceKey="SystemControlPageTextBaseMediumBrush" />
-    <StaticResource x:Key="TextControlPlaceholderForegroundFocused" ResourceKey="SystemControlPageTextChromeBlackMediumLowBrush" />
-    <StaticResource x:Key="TextControlPlaceholderForegroundDisabled" ResourceKey="SystemControlDisabledChromeDisabledLowBrush" />
-    <StaticResource x:Key="TextControlHeaderForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
-    <StaticResource x:Key="TextControlHeaderForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
-    <StaticResource x:Key="TextControlSelectionHighlightColor" ResourceKey="SystemControlHighlightAccentBrush" />
-    <StaticResource x:Key="TextControlButtonBackground" ResourceKey="SystemControlTransparentBrush" />
-    <StaticResource x:Key="TextControlButtonBackgroundPointerOver" ResourceKey="SystemControlTransparentBrush" />
-    <StaticResource x:Key="TextControlButtonBackgroundPressed" ResourceKey="SystemControlHighlightAccentBrush" />
-    <StaticResource x:Key="TextControlButtonBorderBrush" ResourceKey="SystemControlTransparentBrush" />
-    <StaticResource x:Key="TextControlButtonBorderBrushPointerOver" ResourceKey="SystemControlTransparentBrush" />
-    <StaticResource x:Key="TextControlButtonBorderBrushPressed" ResourceKey="SystemControlTransparentBrush" />
-    <StaticResource x:Key="TextControlButtonForeground" ResourceKey="SystemControlForegroundChromeBlackMediumBrush" />
-    <StaticResource x:Key="TextControlButtonForegroundPointerOver" ResourceKey="SystemControlHighlightAccentBrush" />
-    <StaticResource x:Key="TextControlButtonForegroundPressed" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
-    <StaticResource x:Key="ContentLinkForegroundColor" ResourceKey="SystemControlHyperlinkTextBrush" />
-    <StaticResource x:Key="ContentLinkBackgroundColor" ResourceKey="SystemControlPageBackgroundChromeLowBrush" />
-
     <!-- BaseResources for CheckBox.xaml -->
     <StaticResource x:Key="CheckBoxForegroundUnchecked" ResourceKey="SystemControlForegroundBaseHighBrush" />
     <StaticResource x:Key="CheckBoxForegroundUncheckedPointerOver" ResourceKey="SystemControlForegroundBaseHighBrush" />
@@ -209,6 +159,25 @@
     <StaticResource x:Key="CheckBoxCheckGlyphForegroundIndeterminatePointerOver" ResourceKey="SystemControlForegroundBaseHighBrush" />
     <StaticResource x:Key="CheckBoxCheckGlyphForegroundIndeterminatePressed" ResourceKey="SystemControlForegroundBaseMediumBrush" />
     <StaticResource x:Key="CheckBoxCheckGlyphForegroundIndeterminateDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+
+    <!-- BaseResources for Listbox.xaml -->
+    <Thickness x:Key="ListBoxBorderThemeThickness">0</Thickness>
+    <SolidColorBrush x:Key="ListBoxBackgroundThemeBrush" Color="#CCFFFFFF" />
+    <SolidColorBrush x:Key="ListBoxBorderThemeBrush" Color="#45000000" />
+    <SolidColorBrush x:Key="ListBoxDisabledForegroundThemeBrush" Color="#66000000" />
+    <SolidColorBrush x:Key="ListBoxFocusBackgroundThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="ListBoxForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="ListBoxItemDisabledForegroundThemeBrush" Color="#66000000" />
+    <SolidColorBrush x:Key="ListBoxItemPointerOverBackgroundThemeBrush" Color="#21000000" />
+    <SolidColorBrush x:Key="ListBoxItemPointerOverForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="ListBoxItemPressedBackgroundThemeBrush" Color="#FFD3D3D3" />
+    <SolidColorBrush x:Key="ListBoxItemPressedForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="ListBoxItemSelectedBackgroundThemeBrush" Color="#FF4617B4" />
+    <SolidColorBrush x:Key="ListBoxItemSelectedDisabledBackgroundThemeBrush" Color="#8C000000" />
+    <SolidColorBrush x:Key="ListBoxItemSelectedDisabledForegroundThemeBrush" Color="#99FFFFFF" />
+    <SolidColorBrush x:Key="ListBoxItemSelectedForegroundThemeBrush" Color="White" />
+    <SolidColorBrush x:Key="ListBoxItemSelectedPointerOverBackgroundThemeBrush" Color="#FF5F37BE" />
+
     <!-- BaseResources for Slider.xaml -->
     <StaticResource x:Key="SliderContainerBackground" ResourceKey="SystemControlTransparentBrush" />
     <StaticResource x:Key="SliderContainerBackgroundPointerOver" ResourceKey="SystemControlTransparentBrush" />
@@ -231,5 +200,37 @@
     <StaticResource x:Key="SliderTickBarFill" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
     <StaticResource x:Key="SliderTickBarFillDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
     <StaticResource x:Key="SliderInlineTickBarFill" ResourceKey="SystemControlBackgroundAltHighBrush" />
+
+    <!-- BaseResources for TextBox.xaml -->
+    <StaticResource x:Key="TextControlForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="TextControlForegroundPointerOver" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="TextControlForegroundFocused" ResourceKey="SystemControlForegroundChromeBlackHighBrush" />
+    <StaticResource x:Key="TextControlForegroundDisabled" ResourceKey="SystemControlDisabledChromeDisabledLowBrush" />
+    <StaticResource x:Key="TextControlBackground" ResourceKey="SystemControlBackgroundAltMediumLowBrush" />
+    <StaticResource x:Key="TextControlBackgroundPointerOver" ResourceKey="SystemControlBackgroundAltMediumBrush" />
+    <StaticResource x:Key="TextControlBackgroundFocused" ResourceKey="SystemControlBackgroundChromeWhiteBrush" />
+    <StaticResource x:Key="TextControlBackgroundDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <StaticResource x:Key="TextControlBorderBrush" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
+    <StaticResource x:Key="TextControlBorderBrushPointerOver" ResourceKey="SystemControlHighlightBaseMediumBrush" />
+    <StaticResource x:Key="TextControlBorderBrushFocused" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="TextControlBorderBrushDisabled" ResourceKey="SystemControlDisabledBaseLowBrush" />
+    <StaticResource x:Key="TextControlPlaceholderForeground" ResourceKey="SystemControlPageTextBaseMediumBrush" />
+    <StaticResource x:Key="TextControlPlaceholderForegroundPointerOver" ResourceKey="SystemControlPageTextBaseMediumBrush" />
+    <StaticResource x:Key="TextControlPlaceholderForegroundFocused" ResourceKey="SystemControlPageTextChromeBlackMediumLowBrush" />
+    <StaticResource x:Key="TextControlPlaceholderForegroundDisabled" ResourceKey="SystemControlDisabledChromeDisabledLowBrush" />
+    <StaticResource x:Key="TextControlHeaderForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="TextControlHeaderForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="TextControlSelectionHighlightColor" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="TextControlButtonBackground" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="TextControlButtonBackgroundPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="TextControlButtonBackgroundPressed" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="TextControlButtonBorderBrush" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="TextControlButtonBorderBrushPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="TextControlButtonBorderBrushPressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="TextControlButtonForeground" ResourceKey="SystemControlForegroundChromeBlackMediumBrush" />
+    <StaticResource x:Key="TextControlButtonForegroundPointerOver" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="TextControlButtonForegroundPressed" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <StaticResource x:Key="ContentLinkForegroundColor" ResourceKey="SystemControlHyperlinkTextBrush" />
+    <StaticResource x:Key="ContentLinkBackgroundColor" ResourceKey="SystemControlPageBackgroundChromeLowBrush" />
   </Style.Resources>
 </Style>
diff --git a/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesDark.xaml b/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesDark.xaml
index 1de481b40b..b395e3983f 100644
--- a/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesDark.xaml
+++ b/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesDark.xaml
@@ -1,5 +1,5 @@
-<Style xmlns="https://github.com/avaloniaui" 
-  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
+<Style xmlns="https://github.com/avaloniaui"
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
   xmlns:sys="clr-namespace:System;assembly=netstandard">
   <Style.Resources>
     <!-- Resources for Button.xaml -->
@@ -39,49 +39,6 @@
     <SolidColorBrush x:Key="ButtonPressedBackgroundThemeBrush" Color="#FFFFFFFF" />
     <SolidColorBrush x:Key="ButtonPressedForegroundThemeBrush" Color="#FF000000" />
 
-    <!-- Resources for ListBox.xaml -->
-    <Thickness x:Key="ListBoxBorderThemeThickness">0</Thickness>
-    <SolidColorBrush x:Key="ListBoxBackgroundThemeBrush" Color="#CCFFFFFF" />
-    <SolidColorBrush x:Key="ListBoxBorderThemeBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="ListBoxDisabledForegroundThemeBrush" Color="#66FFFFFF" />
-    <SolidColorBrush x:Key="ListBoxFocusBackgroundThemeBrush" Color="#FFFFFFFF" />
-    <SolidColorBrush x:Key="ListBoxForegroundThemeBrush" Color="#FF000000" />
-    <SolidColorBrush x:Key="ListBoxItemDisabledForegroundThemeBrush" Color="#66FFFFFF" />
-    <SolidColorBrush x:Key="ListBoxItemPointerOverBackgroundThemeBrush" Color="#21000000" />
-    <SolidColorBrush x:Key="ListBoxItemPointerOverForegroundThemeBrush" Color="#FF000000" />
-    <SolidColorBrush x:Key="ListBoxItemPressedBackgroundThemeBrush" Color="#FFD3D3D3" />
-    <SolidColorBrush x:Key="ListBoxItemPressedForegroundThemeBrush" Color="#FF000000" />
-    <SolidColorBrush x:Key="ListBoxItemSelectedBackgroundThemeBrush" Color="#FF4617B4" />
-    <SolidColorBrush x:Key="ListBoxItemSelectedDisabledBackgroundThemeBrush" Color="#66FFFFFF" />
-    <SolidColorBrush x:Key="ListBoxItemSelectedDisabledForegroundThemeBrush" Color="#99000000" />
-    <SolidColorBrush x:Key="ListBoxItemSelectedForegroundThemeBrush" Color="White" />
-    <SolidColorBrush x:Key="ListBoxItemSelectedPointerOverBackgroundThemeBrush" Color="#FF5F37BE" />
-
-    <!-- Resources for TextBox.xaml -->
-    <SolidColorBrush x:Key="TextBoxForegroundHeaderThemeBrush" Color="#FFFFFFFF" />
-    <SolidColorBrush x:Key="TextBoxPlaceholderTextThemeBrush" Color="#AB000000" />
-    <SolidColorBrush x:Key="TextBoxBackgroundThemeBrush" Color="#FFFFFFFF" />
-    <SolidColorBrush x:Key="TextBoxBorderThemeBrush" Color="#FFFFFFFF" />
-    <SolidColorBrush x:Key="TextBoxButtonBackgroundThemeBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="TextBoxButtonBorderThemeBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="TextBoxButtonForegroundThemeBrush" Color="#99FFFFFF" />
-    <SolidColorBrush x:Key="TextBoxButtonPointerOverBackgroundThemeBrush" Color="#FFDEDEDE" />
-    <SolidColorBrush x:Key="TextBoxButtonPointerOverBorderThemeBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="TextBoxButtonPointerOverForegroundThemeBrush" Color="#FF000000" />
-    <SolidColorBrush x:Key="TextBoxButtonPressedBackgroundThemeBrush" Color="#FF000000" />
-    <SolidColorBrush x:Key="TextBoxButtonPressedBorderThemeBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="TextBoxButtonPressedForegroundThemeBrush" Color="#FFFFFFFF" />
-    <SolidColorBrush x:Key="TextBoxDisabledBackgroundThemeBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="TextBoxDisabledBorderThemeBrush" Color="#66FFFFFF" />
-    <SolidColorBrush x:Key="TextBoxDisabledForegroundThemeBrush" Color="#FF666666" />
-    <SolidColorBrush x:Key="TextBoxForegroundThemeBrush" Color="#FF000000" />
-    <StaticResource x:Key="TextControlBackgroundFocused" ResourceKey="SystemControlBackgroundAltHighBrush" />
-    <StaticResource x:Key="TextControlBorderBrush" ResourceKey="SystemControlForegroundBaseMediumBrush" />
-    <StaticResource x:Key="TextControlBorderBrushPointerOver" ResourceKey="SystemControlHighlightBaseMediumHighBrush" />
-    <StaticResource x:Key="TextControlButtonForeground" ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
-    <StaticResource x:Key="TextControlForegroundFocused" ResourceKey="SystemControlForegroundBaseHighBrush" />
-    <StaticResource x:Key="TextControlPlaceholderForegroundFocused" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
-
     <!-- Resources for Checkbox.xaml -->
     <Thickness x:Key="CheckBoxBorderThemeThickness">1</Thickness>
     <Thickness x:Key="CheckBoxCheckedStrokeThickness">0</Thickness>
@@ -171,6 +128,25 @@
     <SolidColorBrush x:Key="CheckBoxPressedBackgroundThemeBrush" Color="#FFFFFFFF" />
     <SolidColorBrush x:Key="CheckBoxPressedBorderThemeBrush" Color="#FFFFFFFF" />
     <SolidColorBrush x:Key="CheckBoxPressedForegroundThemeBrush" Color="#FF000000" />
+
+    <!-- Resources for ListBox.xaml -->
+    <Thickness x:Key="ListBoxBorderThemeThickness">0</Thickness>
+    <SolidColorBrush x:Key="ListBoxBackgroundThemeBrush" Color="#CCFFFFFF" />
+    <SolidColorBrush x:Key="ListBoxBorderThemeBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="ListBoxDisabledForegroundThemeBrush" Color="#66FFFFFF" />
+    <SolidColorBrush x:Key="ListBoxFocusBackgroundThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="ListBoxForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="ListBoxItemDisabledForegroundThemeBrush" Color="#66FFFFFF" />
+    <SolidColorBrush x:Key="ListBoxItemPointerOverBackgroundThemeBrush" Color="#21000000" />
+    <SolidColorBrush x:Key="ListBoxItemPointerOverForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="ListBoxItemPressedBackgroundThemeBrush" Color="#FFD3D3D3" />
+    <SolidColorBrush x:Key="ListBoxItemPressedForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="ListBoxItemSelectedBackgroundThemeBrush" Color="#FF4617B4" />
+    <SolidColorBrush x:Key="ListBoxItemSelectedDisabledBackgroundThemeBrush" Color="#66FFFFFF" />
+    <SolidColorBrush x:Key="ListBoxItemSelectedDisabledForegroundThemeBrush" Color="#99000000" />
+    <SolidColorBrush x:Key="ListBoxItemSelectedForegroundThemeBrush" Color="White" />
+    <SolidColorBrush x:Key="ListBoxItemSelectedPointerOverBackgroundThemeBrush" Color="#FF5F37BE" />
+
     <!-- Resources for Slider.xaml -->
     <x:Double x:Key="SliderOutsideTickBarThemeHeight">4</x:Double>
     <x:Double x:Key="SliderTrackThemeHeight">2</x:Double>
@@ -220,5 +196,30 @@
     <SolidColorBrush x:Key="SliderTrackPointerOverBackgroundThemeBrush" Color="#46FFFFFF" />
     <SolidColorBrush x:Key="SliderTrackPressedBackgroundThemeBrush" Color="#59FFFFFF" />
     <SolidColorBrush x:Key="SliderHeaderForegroundThemeBrush" Color="#FFFFFFFF" />
+
+    <!-- Resources for TextBox.xaml -->
+    <SolidColorBrush x:Key="TextBoxForegroundHeaderThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="TextBoxPlaceholderTextThemeBrush" Color="#AB000000" />
+    <SolidColorBrush x:Key="TextBoxBackgroundThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="TextBoxBorderThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="TextBoxButtonBackgroundThemeBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="TextBoxButtonBorderThemeBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="TextBoxButtonForegroundThemeBrush" Color="#99FFFFFF" />
+    <SolidColorBrush x:Key="TextBoxButtonPointerOverBackgroundThemeBrush" Color="#FFDEDEDE" />
+    <SolidColorBrush x:Key="TextBoxButtonPointerOverBorderThemeBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="TextBoxButtonPointerOverForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="TextBoxButtonPressedBackgroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="TextBoxButtonPressedBorderThemeBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="TextBoxButtonPressedForegroundThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="TextBoxDisabledBackgroundThemeBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="TextBoxDisabledBorderThemeBrush" Color="#66FFFFFF" />
+    <SolidColorBrush x:Key="TextBoxDisabledForegroundThemeBrush" Color="#FF666666" />
+    <SolidColorBrush x:Key="TextBoxForegroundThemeBrush" Color="#FF000000" />
+    <StaticResource x:Key="TextControlBackgroundFocused" ResourceKey="SystemControlBackgroundAltHighBrush" />
+    <StaticResource x:Key="TextControlBorderBrush" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <StaticResource x:Key="TextControlBorderBrushPointerOver" ResourceKey="SystemControlHighlightBaseMediumHighBrush" />
+    <StaticResource x:Key="TextControlButtonForeground" ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
+    <StaticResource x:Key="TextControlForegroundFocused" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="TextControlPlaceholderForegroundFocused" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
   </Style.Resources>
 </Style>
diff --git a/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesLight.xaml b/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesLight.xaml
index 1b755c133d..e1cc0302c7 100644
--- a/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesLight.xaml
+++ b/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesLight.xaml
@@ -1,5 +1,5 @@
-<Style xmlns="https://github.com/avaloniaui" 
-  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
+<Style xmlns="https://github.com/avaloniaui"
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
   xmlns:sys="clr-namespace:System;assembly=netstandard">
   <Style.Resources>
     <!-- Resources for Button.xaml -->
@@ -39,49 +39,6 @@
     <SolidColorBrush x:Key="ButtonPressedBackgroundThemeBrush" Color="#FF000000" />
     <SolidColorBrush x:Key="ButtonPressedForegroundThemeBrush" Color="#FFFFFFFF" />
 
-    <!-- Resources for ListBox.xaml -->
-    <Thickness x:Key="ListBoxBorderThemeThickness">0</Thickness>
-    <SolidColorBrush x:Key="ListBoxBackgroundThemeBrush" Color="#CCFFFFFF" />
-    <SolidColorBrush x:Key="ListBoxBorderThemeBrush" Color="#45000000" />
-    <SolidColorBrush x:Key="ListBoxDisabledForegroundThemeBrush" Color="#66000000" />
-    <SolidColorBrush x:Key="ListBoxFocusBackgroundThemeBrush" Color="#FFFFFFFF" />
-    <SolidColorBrush x:Key="ListBoxForegroundThemeBrush" Color="#FF000000" />
-    <SolidColorBrush x:Key="ListBoxItemDisabledForegroundThemeBrush" Color="#66000000" />
-    <SolidColorBrush x:Key="ListBoxItemPointerOverBackgroundThemeBrush" Color="#21000000" />
-    <SolidColorBrush x:Key="ListBoxItemPointerOverForegroundThemeBrush" Color="#FF000000" />
-    <SolidColorBrush x:Key="ListBoxItemPressedBackgroundThemeBrush" Color="#FFD3D3D3" />
-    <SolidColorBrush x:Key="ListBoxItemPressedForegroundThemeBrush" Color="#FF000000" />
-    <SolidColorBrush x:Key="ListBoxItemSelectedBackgroundThemeBrush" Color="#FF4617B4" />
-    <SolidColorBrush x:Key="ListBoxItemSelectedDisabledBackgroundThemeBrush" Color="#8C000000" />
-    <SolidColorBrush x:Key="ListBoxItemSelectedDisabledForegroundThemeBrush" Color="#99FFFFFF" />
-    <SolidColorBrush x:Key="ListBoxItemSelectedForegroundThemeBrush" Color="White" />
-    <SolidColorBrush x:Key="ListBoxItemSelectedPointerOverBackgroundThemeBrush" Color="#FF5F37BE" />
-
-    <!-- Resources for TextBox.xaml -->
-    <SolidColorBrush x:Key="TextBoxForegroundHeaderThemeBrush" Color="#FF000000" />
-    <SolidColorBrush x:Key="TextBoxPlaceholderTextThemeBrush" Color="#AB000000" />
-    <SolidColorBrush x:Key="TextBoxBackgroundThemeBrush" Color="#FFFFFFFF" />
-    <SolidColorBrush x:Key="TextBoxBorderThemeBrush" Color="#A3000000" />
-    <SolidColorBrush x:Key="TextBoxButtonBackgroundThemeBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="TextBoxButtonBorderThemeBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="TextBoxButtonForegroundThemeBrush" Color="#99000000" />
-    <SolidColorBrush x:Key="TextBoxButtonPointerOverBackgroundThemeBrush" Color="#FFDEDEDE" />
-    <SolidColorBrush x:Key="TextBoxButtonPointerOverBorderThemeBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="TextBoxButtonPointerOverForegroundThemeBrush" Color="Black" />
-    <SolidColorBrush x:Key="TextBoxButtonPressedBackgroundThemeBrush" Color="#FF000000" />
-    <SolidColorBrush x:Key="TextBoxButtonPressedBorderThemeBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="TextBoxButtonPressedForegroundThemeBrush" Color="#FFFFFFFF" />
-    <SolidColorBrush x:Key="TextBoxDisabledBackgroundThemeBrush" Color="#66CACACA" />
-    <SolidColorBrush x:Key="TextBoxDisabledBorderThemeBrush" Color="#26000000" />
-    <SolidColorBrush x:Key="TextBoxDisabledForegroundThemeBrush" Color="#FF666666" />
-    <SolidColorBrush x:Key="TextBoxForegroundThemeBrush" Color="#FF000000" />
-    <StaticResource x:Key="TextControlBackgroundFocused" ResourceKey="SystemControlBackgroundAltHighBrush" />
-    <StaticResource x:Key="TextControlBorderBrush" ResourceKey="SystemControlForegroundBaseMediumBrush" />
-    <StaticResource x:Key="TextControlBorderBrushPointerOver" ResourceKey="SystemControlHighlightBaseMediumHighBrush" />
-    <StaticResource x:Key="TextControlButtonForeground" ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
-    <StaticResource x:Key="TextControlForegroundFocused" ResourceKey="SystemControlForegroundBaseHighBrush" />
-    <StaticResource x:Key="TextControlPlaceholderForegroundFocused" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
-
     <!-- Resources for CheckBox.xaml -->
     <x:Double x:Key="CheckBoxBorderThemeThickness">1</x:Double>
     <x:Double x:Key="CheckBoxCheckedStrokeThickness">0</x:Double>
@@ -171,6 +128,25 @@
     <SolidColorBrush x:Key="CheckBoxPressedBackgroundThemeBrush" Color="#FF000000" />
     <SolidColorBrush x:Key="CheckBoxPressedBorderThemeBrush" Color="#FF000000" />
     <SolidColorBrush x:Key="CheckBoxPressedForegroundThemeBrush" Color="#FFFFFFFF" />
+
+    <!-- Resources for ListBox.xaml -->
+    <Thickness x:Key="ListBoxBorderThemeThickness">0</Thickness>
+    <SolidColorBrush x:Key="ListBoxBackgroundThemeBrush" Color="#CCFFFFFF" />
+    <SolidColorBrush x:Key="ListBoxBorderThemeBrush" Color="#45000000" />
+    <SolidColorBrush x:Key="ListBoxDisabledForegroundThemeBrush" Color="#66000000" />
+    <SolidColorBrush x:Key="ListBoxFocusBackgroundThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="ListBoxForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="ListBoxItemDisabledForegroundThemeBrush" Color="#66000000" />
+    <SolidColorBrush x:Key="ListBoxItemPointerOverBackgroundThemeBrush" Color="#21000000" />
+    <SolidColorBrush x:Key="ListBoxItemPointerOverForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="ListBoxItemPressedBackgroundThemeBrush" Color="#FFD3D3D3" />
+    <SolidColorBrush x:Key="ListBoxItemPressedForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="ListBoxItemSelectedBackgroundThemeBrush" Color="#FF4617B4" />
+    <SolidColorBrush x:Key="ListBoxItemSelectedDisabledBackgroundThemeBrush" Color="#8C000000" />
+    <SolidColorBrush x:Key="ListBoxItemSelectedDisabledForegroundThemeBrush" Color="#99FFFFFF" />
+    <SolidColorBrush x:Key="ListBoxItemSelectedForegroundThemeBrush" Color="White" />
+    <SolidColorBrush x:Key="ListBoxItemSelectedPointerOverBackgroundThemeBrush" Color="#FF5F37BE" />
+
     <!-- Resources for Slider.xaml -->
     <x:Double x:Key="SliderOutsideTickBarThemeHeight">4</x:Double>
     <x:Double x:Key="SliderTrackThemeHeight">2</x:Double>
@@ -220,5 +196,30 @@
     <SolidColorBrush x:Key="SliderTrackPointerOverBackgroundThemeBrush" Color="#26000000" />
     <SolidColorBrush x:Key="SliderTrackPressedBackgroundThemeBrush" Color="#33000000" />
     <SolidColorBrush x:Key="SliderHeaderForegroundThemeBrush" Color="#FF000000" />
+
+    <!-- Resources for TextBox.xaml -->
+    <SolidColorBrush x:Key="TextBoxForegroundHeaderThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="TextBoxPlaceholderTextThemeBrush" Color="#AB000000" />
+    <SolidColorBrush x:Key="TextBoxBackgroundThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="TextBoxBorderThemeBrush" Color="#A3000000" />
+    <SolidColorBrush x:Key="TextBoxButtonBackgroundThemeBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="TextBoxButtonBorderThemeBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="TextBoxButtonForegroundThemeBrush" Color="#99000000" />
+    <SolidColorBrush x:Key="TextBoxButtonPointerOverBackgroundThemeBrush" Color="#FFDEDEDE" />
+    <SolidColorBrush x:Key="TextBoxButtonPointerOverBorderThemeBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="TextBoxButtonPointerOverForegroundThemeBrush" Color="Black" />
+    <SolidColorBrush x:Key="TextBoxButtonPressedBackgroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="TextBoxButtonPressedBorderThemeBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="TextBoxButtonPressedForegroundThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="TextBoxDisabledBackgroundThemeBrush" Color="#66CACACA" />
+    <SolidColorBrush x:Key="TextBoxDisabledBorderThemeBrush" Color="#26000000" />
+    <SolidColorBrush x:Key="TextBoxDisabledForegroundThemeBrush" Color="#FF666666" />
+    <SolidColorBrush x:Key="TextBoxForegroundThemeBrush" Color="#FF000000" />
+    <StaticResource x:Key="TextControlBackgroundFocused" ResourceKey="SystemControlBackgroundAltHighBrush" />
+    <StaticResource x:Key="TextControlBorderBrush" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <StaticResource x:Key="TextControlBorderBrushPointerOver" ResourceKey="SystemControlHighlightBaseMediumHighBrush" />
+    <StaticResource x:Key="TextControlButtonForeground" ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
+    <StaticResource x:Key="TextControlForegroundFocused" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="TextControlPlaceholderForegroundFocused" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
   </Style.Resources>
 </Style>

From fb6bdc1705dac2296b54b107d41e3b848da2a650 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Thu, 28 May 2020 21:40:29 -0300
Subject: [PATCH 11/45] working horizontal slider.

---
 src/Avalonia.Themes.Fluent/Slider.xaml | 312 +++++++++++--------------
 1 file changed, 133 insertions(+), 179 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Slider.xaml b/src/Avalonia.Themes.Fluent/Slider.xaml
index bb7a4cda8e..1bb76b1606 100644
--- a/src/Avalonia.Themes.Fluent/Slider.xaml
+++ b/src/Avalonia.Themes.Fluent/Slider.xaml
@@ -1,4 +1,9 @@
 <Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <Design.PreviewWith>
+    <Border Margin="20" Width="200">
+      <Slider Value="50" />
+    </Border>
+  </Design.PreviewWith>
   <Styles.Resources>
     <Thickness x:Key="SliderTopHeaderMargin">0,0,0,4</Thickness>
     <GridLength x:Key="SliderPreContentMargin">15</GridLength>
@@ -11,202 +16,151 @@
     <x:Double x:Key="SliderVerticalThumbWidth">20</x:Double>
     <x:Double x:Key="SliderVerticalThumbHeight">20</x:Double>
   </Styles.Resources>
-  <!-- Disabled State -->
-  <!-- <Style Selector="Slider:disabled /template/ ContentPresenter#HeaderContentPresenter">
-    <Setter Property="Foreground" Value="{DynamicResource SliderHeaderForegroundDisabled}" />
-  </Style> -->
-  <Style Selector="Slider:disabled /template/ Border#HorizontalDecreaseRect">
-    <Setter Property="Background" Value="{DynamicResource SliderTrackValueFillDisabled}" />
-  </Style>
-  <Style Selector="Slider:disabled /template/ Border#HorizontalTrackRect">
-    <Setter Property="Background" Value="{DynamicResource SliderTrackFillDisabled}" />
-  </Style>
-  <Style Selector="Slider:disabled /template/ Border#VerticalDecreaseRect">
-    <Setter Property="Background" Value="{DynamicResource SliderTrackValueFillDisabled}" />
-  </Style>
-  <Style Selector="Slider:disabled /template/ Border#VerticalTrackRect">
-    <Setter Property="Background" Value="{DynamicResource SliderTrackFillDisabled}" />
-  </Style>
-  <Style Selector="Slider:disabled /template/ Thumb#HorizontalThumb /template/ Border">
-    <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundDisabled}" />
-  </Style>
-  <Style Selector="Slider:disabled /template/ Thumb#VerticalThumb /template/ Border">
-    <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundDisabled}" />
-  </Style>
-  <!-- <Style Selector="Slider:disabled /template/ TickBar#TopTickBar">
-    <Setter Property="Background" Value="{DynamicResource SliderTickBarFillDisabled}" />
-  </Style>
-  <Style Selector="Slider:disabled /template/ TickBar#BottomTickBar">
-    <Setter Property="Background" Value="{DynamicResource SliderTickBarFillDisabled}" />
-  </Style>
-  <Style Selector="Slider:disabled /template/ TickBar#LeftTickBar">
-    <Setter Property="Background" Value="{DynamicResource SliderTickBarFillDisabled}" />
-  </Style>
-  <Style Selector="Slider:disabled /template/ TickBar#RightTickBar">
-    <Setter Property="Background" Value="{DynamicResource SliderTickBarFillDisabled}" />
-  </Style> -->
-  <Style Selector="Slider:disabled /template/ Grid#SliderContainer">
-    <Setter Property="Background" Value="{DynamicResource SliderContainerBackgroundDisabled}" />
-  </Style>
-  <!-- Pressed State -->
-  <Style Selector="Slider:pressed /template/ Border#HorizontalTrackRect">
-    <Setter Property="Background" Value="{DynamicResource SliderTrackFillPressed}" />
-  </Style>
-  <Style Selector="Slider:pressed /template/ Border#HorizontalTrackRect">
-    <Setter Property="Background" Value="{DynamicResource SliderTrackFillPressed}" />
-  </Style>
-  <Style Selector="Slider:pressed /template/ Border#VerticalTrackRect">
-    <Setter Property="Background" Value="{DynamicResource SliderTrackFillPressed}" />
-  </Style>
-  <Style Selector="Slider:pressed /template/ Thumb#HorizontalThumb /template/ Border">
-    <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundPressed}" />
-  </Style>
-  <Style Selector="Slider:pressed /template/ Thumb#VerticalThumb /template/ Border">
-    <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundPressed}" />
-  </Style>
-  <Style Selector="Slider:pressed /template/ Grid#SliderContainer">
-    <Setter Property="Background" Value="{DynamicResource SliderContainerBackgroundPressed}" />
-  </Style>
-  <Style Selector="Slider:pressed /template/ Border#HorizontalDecreaseRect">
-    <Setter Property="Background" Value="{DynamicResource SliderTrackValueFillPressed}" />
-  </Style>
-  <Style Selector="Slider:pressed /template/ Border#VerticalDecreaseRect">
-    <Setter Property="Background" Value="{DynamicResource SliderTrackValueFillPressed}" />
-  </Style>
-  <!-- PointerOver State -->
-  <Style Selector="Slider:pointerover /template/ Border#HorizontalTrackRect">
-    <Setter Property="Background" Value="{DynamicResource SliderTrackFillPointerOver}" />
-  </Style>
-  <Style Selector="Slider:pointerover /template/ Border#VerticalTrackRect">
-    <Setter Property="Background" Value="{DynamicResource SliderTrackFillPointerOver}" />
-  </Style>
-  <Style Selector="Slider:pointerover /template/ Thumb#HorizontalThumb /template/ Border">
-    <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundPointerOver}" />
-  </Style>
-  <Style Selector="Slider:pointerover /template/ Thumb#VerticalThumb /template/ Border">
-    <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundPointerOver}" />
-  </Style>
-  <Style Selector="Slider:pointerover /template/ Grid#SliderContainer">
-    <Setter Property="Background" Value="{DynamicResource SliderContainerBackgroundPointerOver}" />
-  </Style>
-  <Style Selector="Slider:pointerover /template/ Border#HorizontalDecreaseRect">
-    <Setter Property="Background" Value="{DynamicResource SliderTrackValueFillPointerOver}" />
-  </Style>
-  <Style Selector="Slider:pointerover /template/ Border#VerticalDecreaseRect">
-    <Setter Property="Background" Value="{DynamicResource SliderTrackValueFillPointerOver}" />
-  </Style>
-  
-  <!-- TODO: We don't have an equivalent for this afaik. -->
-  <!-- <VisualState Name="FocusDisengaged" />
-  <VisualState Name="FocusEngagedHorizontal">
-    <Storyboard>
-      <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SliderContainer" Storyboard.TargetProperty="(Control.IsTemplateFocusTarget)">
-        <DiscreteObjectKeyFrame KeyTime="0" Value="False" />
-      </ObjectAnimationUsingKeyFrames>
-      <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HorizontalThumb" Storyboard.TargetProperty="(Control.IsTemplateFocusTarget)">
-        <DiscreteObjectKeyFrame KeyTime="0" Value="True" />
-      </ObjectAnimationUsingKeyFrames>
-    </Storyboard>
-  </VisualState>
-  <VisualState Name="FocusEngagedVertical">
-    <Storyboard>
-      <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SliderContainer" Storyboard.TargetProperty="(Control.IsTemplateFocusTarget)">
-        <DiscreteObjectKeyFrame KeyTime="0" Value="False" />
-      </ObjectAnimationUsingKeyFrames>
-      <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalThumb" Storyboard.TargetProperty="(Control.IsTemplateFocusTarget)">
-        <DiscreteObjectKeyFrame KeyTime="0" Value="True" />
-      </ObjectAnimationUsingKeyFrames>
-    </Storyboard>
-     --> 
-    
-  <Style Selector="Slider:vertical /template/ Grid#VerticalTemplate">
-    <Setter Property="IsVisible" Value="True" />
-  </Style>
-  <Style Selector="Slider:vertical /template/ Grid#HorizontalTemplate">
-    <Setter Property="IsVisible" Value="False" />
-  </Style>
-  <Style Selector="Slider:horizontal /template/ Grid#HorizontalTemplate">
-    <Setter Property="IsVisible" Value="True" />
-  </Style>
-  <Style Selector="Slider:horizontal /template/ Grid#VerticalTemplate">
-    <Setter Property="IsVisible" Value="False" />
-  </Style>
-
-  <Style Selector="Slider">
+  <Style Selector="Slider:horizontal">
     <Setter Property="Background" Value="{DynamicResource SliderTrackFill}" />
     <Setter Property="BorderThickness" Value="{DynamicResource SliderBorderThemeThickness}" />
     <Setter Property="Foreground" Value="{DynamicResource SliderTrackValueFill}" />
     <Setter Property="FontFamily" Value="{DynamicResource ContentControlThemeFontFamily}" />
     <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-    <!-- TODO Non-existent properties in avalonia. -->
-    <!-- <Setter Property="ManipulationMode" Value="None" />
-    <Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
-    <Setter Property="FocusVisualMargin" Value="-7,0,-7,0" />
-    <Setter Property="IsFocusEngagementEnabled" Value="True" /> -->
     <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate>
-          <Border Margin="{TemplateBinding Padding}" CornerRadius="{DynamicResource ControlCornerRadius}">
-            <Border.Styles>
+      <ControlTemplate>
+        <Border BorderThickness="{TemplateBinding BorderThickness}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                CornerRadius="{DynamicResource ControlCornerRadius}">
+
+          <Grid Name="grid" Margin="{TemplateBinding Padding}" RowDefinitions="Auto, *">
+            <Grid.Styles>
               <Style Selector="Thumb.SliderThumbStyle">
-                <Setter Property="BorderThickness" Value="0" />
-                <Setter Property="Background" Value="{DynamicResource SliderThumbBackground}" />
+                <Setter Property="BorderThickness" Value="0" />                
                 <Setter Property="Template">
                   <Setter.Value>
                     <ControlTemplate>
-                      <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{DynamicResource SliderThumbCornerRadius}" />
+                      <Border Background="{TemplateBinding Background}"
+                              BorderBrush="{TemplateBinding BorderBrush}"
+                              BorderThickness="{TemplateBinding BorderThickness}"
+                              CornerRadius="{DynamicResource SliderThumbCornerRadius}" />
                     </ControlTemplate>
                   </Setter.Value>
                 </Setter>
               </Style>
-            </Border.Styles>
-            <Grid RowDefinitions="Auto,*">
-              <!-- TODO removed TextBlock.TextWrapping; bind Content -> Header and ContentTemplate -> HeaderTemplate -->
-              <ContentPresenter Name="HeaderContentPresenter" Grid.Row="0" TextBlock.FontWeight="{DynamicResource SliderHeaderThemeFontWeight}" TextBlock.Foreground="{DynamicResource SliderHeaderForeground}" Margin="{DynamicResource SliderTopHeaderMargin}"
-              IsVisible="False" />
-              <!-- TODO removed Control.IsTemplateFocusTarget -->
-              <Grid Name="SliderContainer" Grid.Row="1" Background="{DynamicResource SliderContainerBackground}">
-                <Grid Name="HorizontalTemplate" ColumnDefinitions="Auto,Auto,*" MinHeight="{DynamicResource SliderHorizontalHeight}">
-                  <Grid.RowDefinitions>
-                    <RowDefinition Height="{DynamicResource SliderPreContentMargin}" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="{DynamicResource SliderPostContentMargin}" />
-                  </Grid.RowDefinitions>
-                  <Border Name="HorizontalTrackRect" Background="{TemplateBinding Background}" Height="{DynamicResource SliderTrackThemeHeight}" Grid.Row="1" Grid.ColumnSpan="3" CornerRadius="{Binding CornerRadius}" />
-                  <Border Name="HorizontalDecreaseRect" Background="{TemplateBinding Foreground}" Grid.Row="1" CornerRadius="{Binding CornerRadius}" />
-                  <!-- TODO TickBars are not implemented yet. -->
-                  <!--
-                <TickBar Name="TopTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderTickBarFill}" Height="{DynamicResource SliderOutsideTickBarThemeHeight}" VerticalAlignment="Bottom" Margin="0,0,0,4" Grid.ColumnSpan="3" />
-                <TickBar Name="HorizontalInlineTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderInlineTickBarFill}" Height="{DynamicResource SliderTrackThemeHeight}" Grid.Row="1" Grid.ColumnSpan="3" />
-                <TickBar Name="BottomTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderTickBarFill}" Height="{DynamicResource SliderOutsideTickBarThemeHeight}" VerticalAlignment="Top" Margin="0,4,0,0" Grid.Row="2" Grid.ColumnSpan="3" />
-                -->
-                  <!-- TODO Removed FocusVisualMargin and AutomationProperties.AccessibilityView -->
-                  <Thumb Name="HorizontalThumb" Classes="SliderThumbStyle" DataContext="{TemplateBinding Value}" Height="{DynamicResource SliderHorizontalThumbHeight}" Width="{DynamicResource SliderHorizontalThumbWidth}" Grid.Row="0"
-                  Grid.RowSpan="3" Grid.Column="1" />
-                </Grid>
-                <Grid Name="VerticalTemplate" RowDefinitions="*,Auto,Auto" MinWidth="{DynamicResource SliderVerticalWidth}">
-                  <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="{DynamicResource SliderPreContentMargin}" />
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="{DynamicResource SliderPostContentMargin}" />
-                  </Grid.ColumnDefinitions>
-                  <Border Name="VerticalTrackRect" Background="{TemplateBinding Background}" Width="{DynamicResource SliderTrackThemeHeight}" Grid.Column="1" Grid.RowSpan="3" CornerRadius="{Binding CornerRadius}" />
-                  <Border Name="VerticalDecreaseRect" Background="{TemplateBinding Foreground}" Grid.Column="1" Grid.Row="2" CornerRadius="{Binding CornerRadius}" />
-                  <!-- TODO TickBars are not implemented yet. -->
-                  <!-- 
-                <TickBar Name="LeftTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderTickBarFill}" Width="{DynamicResource SliderOutsideTickBarThemeHeight}" HorizontalAlignment="Right" Margin="0,0,4,0" Grid.RowSpan="3" />
-                <TickBar Name="VerticalInlineTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderInlineTickBarFill}" Width="{DynamicResource SliderTrackThemeHeight}" Grid.Column="1" Grid.RowSpan="3" />
-                <TickBar Name="RightTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderTickBarFill}" Width="{DynamicResource SliderOutsideTickBarThemeHeight}" HorizontalAlignment="Left" Margin="4,0,0,0" Grid.Column="2" Grid.RowSpan="3" /> 
-                -->
-                  <!-- TODO Removed FocusVisualMargin and AutomationProperties.AccessibilityView-->
-                  <Thumb Name="VerticalThumb" Classes="SliderThumbStyle" DataContext="{TemplateBinding Value}" Width="{DynamicResource SliderVerticalThumbWidth}" Height="{DynamicResource SliderVerticalThumbHeight}" Grid.Row="1" Grid.Column="0"
+            </Grid.Styles>
+            <ContentPresenter x:Name="HeaderContentPresenter"
+                             Grid.Row="0"
+                           
+                             TextBlock.FontWeight="{DynamicResource SliderHeaderThemeFontWeight}"
+                             TextBlock.Foreground="{DynamicResource SliderHeaderForeground}"
+                             Margin="{DynamicResource SliderTopHeaderMargin}" />
+            <Grid x:Name="SliderContainer"
+                              Grid.Row="1">
+              <Grid x:Name="HorizontalTemplate" MinHeight="{DynamicResource SliderHorizontalHeight}">
+
+                <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="Auto" />
+                  <ColumnDefinition Width="Auto" />
+                  <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
+
+                <Grid.RowDefinitions>
+                  <RowDefinition Height="{DynamicResource SliderPreContentMargin}" />
+                  <RowDefinition Height="Auto" />
+                  <RowDefinition Height="{DynamicResource SliderPostContentMargin}" />
+                </Grid.RowDefinitions>
+
+                <!--
+              <TickBar x:Name="TopTickBar"
+                  Visibility="Collapsed"
+                  Fill="{DynamicResource SliderTickBarFill}"
+                  Height="{DynamicResource SliderOutsideTickBarThemeHeight}"
+                  VerticalAlignment="Bottom"
+                  Margin="0,0,0,4"
+                  Grid.ColumnSpan="3" />
+              <TickBar x:Name="HorizontalInlineTickBar"
+                  Visibility="Collapsed"
+                  Fill="{DynamicResource SliderInlineTickBarFill}"
+                  Height="{DynamicResource SliderTrackThemeHeight}"
+                  Grid.Row="1"
                   Grid.ColumnSpan="3" />
-                </Grid>
+              <TickBar x:Name="BottomTickBar"
+                  Visibility="Collapsed"
+                  Fill="{DynamicResource SliderTickBarFill}"
+                  Height="{DynamicResource SliderOutsideTickBarThemeHeight}"
+                  VerticalAlignment="Top"
+                  Margin="0,4,0,0"
+                  Grid.Row="2"
+                  Grid.ColumnSpan="3" /> -->
+
+                <Track Name="PART_Track"
+                       Grid.Row="1"
+                       Grid.ColumnSpan="3"
+                       
+                       Orientation="Horizontal">
+                  <Track.DecreaseButton>
+                    <RepeatButton Name="PART_DecreaseButton" Background="{TemplateBinding Foreground}">
+                      <RepeatButton.Template>
+                        <ControlTemplate>
+                          <Border Name="TrackBackground" Background="{TemplateBinding Background}" CornerRadius="{DynamicResource ControlCornerRadius}" Height="{DynamicResource SliderTrackThemeHeight}" VerticalAlignment="Center"/>
+                        </ControlTemplate>
+                      </RepeatButton.Template>
+                    </RepeatButton>
+                  </Track.DecreaseButton>
+                  <Track.IncreaseButton>
+                    <RepeatButton Name="PART_IncreaseButton" Margin="0" Padding="0" Background="{TemplateBinding Background}"
+                                  Classes="repeattrack">
+                      <RepeatButton.Template>
+                        <ControlTemplate>
+                          <Border Name="TrackBackground" Background="{TemplateBinding Background}" CornerRadius="{DynamicResource ControlCornerRadius}" Height="{DynamicResource SliderTrackThemeHeight}" VerticalAlignment="Center"/>
+                        </ControlTemplate>
+                      </RepeatButton.Template>
+                    </RepeatButton>
+                  </Track.IncreaseButton>
+                  <Thumb Classes="SliderThumbStyle" 
+                         Name="thumb" 
+                         Margin="0" Padding="0" 
+                         DataContext="{TemplateBinding Value}" 
+                         Height="{DynamicResource SliderHorizontalThumbHeight}" 
+                         Width="{DynamicResource SliderHorizontalThumbWidth}" />
+                </Track>
               </Grid>
             </Grid>
-          </Border>
-        </ControlTemplate>
-      </Setter.Value>
+          </Grid>
+        </Border>
+      </ControlTemplate>
     </Setter>
   </Style>
+
+  <Style Selector="Slider /template/ Track#PART_Track">
+    <Setter Property="Minimum" Value="{TemplateBinding Minimum}"/>
+    <Setter Property="Maximum" Value="{TemplateBinding Maximum}"/>
+    <Setter Property="Value" Value="{TemplateBinding Value, Mode=TwoWay}"/>
+  </Style>
+
+  <!-- Normal State -->
+  <Style Selector="Slider /template/ Thumb.SliderThumbStyle">
+    <Setter Property="Background" Value="{DynamicResource SliderThumbBackground}" />
+  </Style>
+  
+  <Style Selector="Slider /template/ Grid#SliderContainer">
+    <Setter Property="Background" Value="{DynamicResource SliderContainerBackground}" />
+  </Style>  
+
+  <!-- Pressed State -->
+
+  <!-- Disabled State -->
+
+  <!-- PointerOver State -->
+  <Style Selector="Slider:pointerover /template/ RepeatButton#PART_IncreaseButton">
+    <Setter Property="Background" Value="{DynamicResource SliderTrackFillPointerOver}" />
+  </Style>  
+
+  <Style Selector="Slider:pointerover /template/ Thumb.SliderThumbStyle">
+    <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundPointerOver}" />
+  </Style>
+
+  <Style Selector="Slider:pointerover /template/ Grid#SliderContainer">
+    <Setter Property="Background" Value="{DynamicResource SliderContainerBackgroundPointerOver}" />
+  </Style>
+
+  <Style Selector="Slider:pointerover /template/ RepeatButton#PART_DecreaseButton">
+    <Setter Property="Background" Value="{DynamicResource SliderTrackValueFillPointerOver}" />
+  </Style>
 </Styles>

From dc9659747fc9e45353654fc5d4735aabb7ca99ad Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Thu, 28 May 2020 22:27:48 -0300
Subject: [PATCH 12/45] add pressed and disabled states.

---
 src/Avalonia.Controls/Slider.cs        | 21 +++++++++
 src/Avalonia.Themes.Fluent/Slider.xaml | 61 +++++++++++++++++++++-----
 2 files changed, 70 insertions(+), 12 deletions(-)

diff --git a/src/Avalonia.Controls/Slider.cs b/src/Avalonia.Controls/Slider.cs
index b7a571af18..0155ff211a 100644
--- a/src/Avalonia.Controls/Slider.cs
+++ b/src/Avalonia.Controls/Slider.cs
@@ -44,6 +44,9 @@ namespace Avalonia.Controls
             Thumb.DragStartedEvent.AddClassHandler<Slider>((x, e) => x.OnThumbDragStarted(e), RoutingStrategies.Bubble);
             Thumb.DragDeltaEvent.AddClassHandler<Slider>((x, e) => x.OnThumbDragDelta(e), RoutingStrategies.Bubble);
             Thumb.DragCompletedEvent.AddClassHandler<Slider>((x, e) => x.OnThumbDragCompleted(e), RoutingStrategies.Bubble);
+            PointerPressedEvent.AddClassHandler<Slider>((x, e) => x.HandlePointerPressed(e), RoutingStrategies.Tunnel, true);
+            PointerReleasedEvent.AddClassHandler<Slider>((x, e) => x.HandlePointerReleased(), RoutingStrategies.Tunnel, true);
+            PointerCaptureLostEvent.AddClassHandler<Slider>((x, e) => x.HandlePointerReleased(), RoutingStrategies.Tunnel, true);
         }
 
         /// <summary>
@@ -207,6 +210,24 @@ namespace Avalonia.Controls
             return value;
         }
 
+        private void HandlePointerPressed(PointerPressedEventArgs e)
+        {
+            if (e.GetCurrentPoint(this).Properties.IsLeftButtonPressed)
+            {
+                UpdatePseudoClasses(true);
+            }
+        }
+
+        private void HandlePointerReleased()
+        {
+            UpdatePseudoClasses(false);
+        }
+
+        private void UpdatePseudoClasses(bool isPressed)
+        {
+            PseudoClasses.Set(":pressed", isPressed);
+        }
+
         private void UpdatePseudoClasses(Orientation o)
         {
             PseudoClasses.Set(":vertical", o == Orientation.Vertical);
diff --git a/src/Avalonia.Themes.Fluent/Slider.xaml b/src/Avalonia.Themes.Fluent/Slider.xaml
index 1bb76b1606..3db372725a 100644
--- a/src/Avalonia.Themes.Fluent/Slider.xaml
+++ b/src/Avalonia.Themes.Fluent/Slider.xaml
@@ -1,7 +1,10 @@
 <Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <Design.PreviewWith>
     <Border Margin="20" Width="200">
-      <Slider Value="50" />
+      <StackPanel Spacing="10">
+        <Slider Value="50" />
+        <Slider IsEnabled="False" Value="50" />
+      </StackPanel>
     </Border>
   </Design.PreviewWith>
   <Styles.Resources>
@@ -31,7 +34,7 @@
           <Grid Name="grid" Margin="{TemplateBinding Padding}" RowDefinitions="Auto, *">
             <Grid.Styles>
               <Style Selector="Thumb.SliderThumbStyle">
-                <Setter Property="BorderThickness" Value="0" />                
+                <Setter Property="BorderThickness" Value="0" />
                 <Setter Property="Template">
                   <Setter.Value>
                     <ControlTemplate>
@@ -113,11 +116,11 @@
                       </RepeatButton.Template>
                     </RepeatButton>
                   </Track.IncreaseButton>
-                  <Thumb Classes="SliderThumbStyle" 
-                         Name="thumb" 
-                         Margin="0" Padding="0" 
-                         DataContext="{TemplateBinding Value}" 
-                         Height="{DynamicResource SliderHorizontalThumbHeight}" 
+                  <Thumb Classes="SliderThumbStyle"
+                         Name="thumb"
+                         Margin="0" Padding="0"
+                         DataContext="{TemplateBinding Value}"
+                         Height="{DynamicResource SliderHorizontalThumbHeight}"
                          Width="{DynamicResource SliderHorizontalThumbWidth}" />
                 </Track>
               </Grid>
@@ -138,19 +141,36 @@
   <Style Selector="Slider /template/ Thumb.SliderThumbStyle">
     <Setter Property="Background" Value="{DynamicResource SliderThumbBackground}" />
   </Style>
-  
+
   <Style Selector="Slider /template/ Grid#SliderContainer">
     <Setter Property="Background" Value="{DynamicResource SliderContainerBackground}" />
-  </Style>  
-
-  <!-- Pressed State -->
+  </Style>
 
   <!-- Disabled State -->
+  <Style Selector="Slider:disabled /template/ ContentPresenter#HeaderContentPresenter">
+    <Setter Property="TextBlock.Foreground" Value="{DynamicResource SliderHeaderForegroundDisabled}" />
+  </Style>
+
+  <Style Selector="Slider:disabled /template/ RepeatButton#PART_DecreaseButton">
+    <Setter Property="Background" Value="{DynamicResource SliderTrackValueFillDisabled}" />
+  </Style>
+
+  <Style Selector="Slider:disabled /template/ RepeatButton#PART_IncreaseButton">
+    <Setter Property="Background" Value="{DynamicResource SliderTrackFillDisabled}" />
+  </Style>
+
+  <Style Selector="Slider:disabled /template/ Thumb.SliderThumbStyle">
+    <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundDisabled}" />
+  </Style>
+
+  <Style Selector="Slider:pointerover /template/ Grid#SliderContainer">
+    <Setter Property="Background" Value="{DynamicResource SliderContainerBackgroundDisabled}" />
+  </Style>
 
   <!-- PointerOver State -->
   <Style Selector="Slider:pointerover /template/ RepeatButton#PART_IncreaseButton">
     <Setter Property="Background" Value="{DynamicResource SliderTrackFillPointerOver}" />
-  </Style>  
+  </Style>
 
   <Style Selector="Slider:pointerover /template/ Thumb.SliderThumbStyle">
     <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundPointerOver}" />
@@ -163,4 +183,21 @@
   <Style Selector="Slider:pointerover /template/ RepeatButton#PART_DecreaseButton">
     <Setter Property="Background" Value="{DynamicResource SliderTrackValueFillPointerOver}" />
   </Style>
+
+  <!-- Pressed State -->
+  <Style Selector="Slider:pressed /template/ RepeatButton#PART_IncreaseButton">
+    <Setter Property="Background" Value="{DynamicResource SliderTrackFillPressed}" />
+  </Style>
+
+  <Style Selector="Slider:pressed /template/ Thumb.SliderThumbStyle">
+    <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundPressed}" />
+  </Style>
+
+  <Style Selector="Slider:pointerover /template/ Grid#SliderContainer">
+    <Setter Property="Background" Value="{DynamicResource SliderContainerBackgroundPressed}" />
+  </Style>
+
+  <Style Selector="Slider:pointerover /template/ RepeatButton#PART_DecreaseButton">
+    <Setter Property="Background" Value="{DynamicResource SliderTrackValueFillPressed}" />
+  </Style>
 </Styles>

From 38a144deb46d52716cc8a0296c760ae1cb92308c Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Thu, 28 May 2020 22:31:20 -0300
Subject: [PATCH 13/45] designer preview for slider has horizontal and vertical
 sliders.

---
 src/Avalonia.Themes.Fluent/Slider.xaml | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Slider.xaml b/src/Avalonia.Themes.Fluent/Slider.xaml
index 3db372725a..13080e6212 100644
--- a/src/Avalonia.Themes.Fluent/Slider.xaml
+++ b/src/Avalonia.Themes.Fluent/Slider.xaml
@@ -1,10 +1,16 @@
 <Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <Design.PreviewWith>
-    <Border Margin="20" Width="200">
-      <StackPanel Spacing="10">
-        <Slider Value="50" />
-        <Slider IsEnabled="False" Value="50" />
-      </StackPanel>
+    <Border Margin="20" Width="200" Height="200">
+      <DockPanel LastChildFill="True">
+        <StackPanel Spacing="10" DockPanel.Dock="Top">
+          <Slider Value="50" />
+          <Slider IsEnabled="False" Value="50" />
+        </StackPanel>
+        <StackPanel Spacing="10" Orientation="Horizontal">
+          <Slider Value="50"  Orientation="Vertical" />
+          <Slider IsEnabled="False" Orientation="Vertical" Value="50" />
+        </StackPanel>
+      </DockPanel>
     </Border>
   </Design.PreviewWith>
   <Styles.Resources>

From abce7e9d79cf452bd8ea74f335e16cc8de0cf436 Mon Sep 17 00:00:00 2001
From: Jumar Macato <hikari.netto23@gmail.com>
Date: Fri, 29 May 2020 11:12:58 +0800
Subject: [PATCH 14/45] add vertical style

---
 src/Avalonia.Controls/Slider.cs        |  15 +--
 src/Avalonia.Themes.Fluent/Slider.xaml | 169 ++++++++++++++-----------
 2 files changed, 99 insertions(+), 85 deletions(-)

diff --git a/src/Avalonia.Controls/Slider.cs b/src/Avalonia.Controls/Slider.cs
index 0155ff211a..b218c003c2 100644
--- a/src/Avalonia.Controls/Slider.cs
+++ b/src/Avalonia.Controls/Slider.cs
@@ -97,18 +97,9 @@ namespace Avalonia.Controls
                 _increaseButton.Click -= IncreaseClick;
             }
 
-            // _decreaseButton = e.NameScope.Find<Button>("PART_DecreaseButton");
-
-            if (Orientation == Orientation.Horizontal)
-            {
-                // _track = e.NameScope.Find<Track>("HorizontalThumb");
-            }
-            else
-            {
-                // _track = e.NameScope.Find<Track>("VerticalThumb");
-            }
-
-            // _increaseButton = e.NameScope.Find<Button>("PART_IncreaseButton");
+            _decreaseButton = e.NameScope.Find<Button>("PART_DecreaseButton");
+            _track = e.NameScope.Find<Track>("PART_Track");        
+            _increaseButton = e.NameScope.Find<Button>("PART_IncreaseButton");
 
             if (_decreaseButton != null)
             {
diff --git a/src/Avalonia.Themes.Fluent/Slider.xaml b/src/Avalonia.Themes.Fluent/Slider.xaml
index 13080e6212..75f3e97367 100644
--- a/src/Avalonia.Themes.Fluent/Slider.xaml
+++ b/src/Avalonia.Themes.Fluent/Slider.xaml
@@ -1,4 +1,5 @@
-<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<Styles xmlns="https://github.com/avaloniaui" 
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <Design.PreviewWith>
     <Border Margin="20" Width="200" Height="200">
       <DockPanel LastChildFill="True">
@@ -7,7 +8,7 @@
           <Slider IsEnabled="False" Value="50" />
         </StackPanel>
         <StackPanel Spacing="10" Orientation="Horizontal">
-          <Slider Value="50"  Orientation="Vertical" />
+          <Slider Value="50" Orientation="Vertical" />
           <Slider IsEnabled="False" Orientation="Vertical" Value="50" />
         </StackPanel>
       </DockPanel>
@@ -25,6 +26,18 @@
     <x:Double x:Key="SliderVerticalThumbWidth">20</x:Double>
     <x:Double x:Key="SliderVerticalThumbHeight">20</x:Double>
   </Styles.Resources>
+
+  <Style Selector="Thumb.SliderThumbStyle">
+    <Setter Property="BorderThickness" Value="0" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate>
+          <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{DynamicResource SliderThumbCornerRadius}" />
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+
   <Style Selector="Slider:horizontal">
     <Setter Property="Background" Value="{DynamicResource SliderTrackFill}" />
     <Setter Property="BorderThickness" Value="{DynamicResource SliderBorderThemeThickness}" />
@@ -33,41 +46,11 @@
     <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
     <Setter Property="Template">
       <ControlTemplate>
-        <Border BorderThickness="{TemplateBinding BorderThickness}"
-                BorderBrush="{TemplateBinding BorderBrush}"
-                CornerRadius="{DynamicResource ControlCornerRadius}">
-
+        <Border BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="{DynamicResource ControlCornerRadius}">
           <Grid Name="grid" Margin="{TemplateBinding Padding}" RowDefinitions="Auto, *">
-            <Grid.Styles>
-              <Style Selector="Thumb.SliderThumbStyle">
-                <Setter Property="BorderThickness" Value="0" />
-                <Setter Property="Template">
-                  <Setter.Value>
-                    <ControlTemplate>
-                      <Border Background="{TemplateBinding Background}"
-                              BorderBrush="{TemplateBinding BorderBrush}"
-                              BorderThickness="{TemplateBinding BorderThickness}"
-                              CornerRadius="{DynamicResource SliderThumbCornerRadius}" />
-                    </ControlTemplate>
-                  </Setter.Value>
-                </Setter>
-              </Style>
-            </Grid.Styles>
-            <ContentPresenter x:Name="HeaderContentPresenter"
-                             Grid.Row="0"
-                           
-                             TextBlock.FontWeight="{DynamicResource SliderHeaderThemeFontWeight}"
-                             TextBlock.Foreground="{DynamicResource SliderHeaderForeground}"
-                             Margin="{DynamicResource SliderTopHeaderMargin}" />
-            <Grid x:Name="SliderContainer"
-                              Grid.Row="1">
-              <Grid x:Name="HorizontalTemplate" MinHeight="{DynamicResource SliderHorizontalHeight}">
-
-                <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
+            <ContentPresenter x:Name="HeaderContentPresenter" Grid.Row="0" TextBlock.FontWeight="{DynamicResource SliderHeaderThemeFontWeight}" TextBlock.Foreground="{DynamicResource SliderHeaderForeground}" Margin="{DynamicResource SliderTopHeaderMargin}" />
+            <Grid x:Name="SliderContainer" Grid.Row="1">
+              <Grid x:Name="HorizontalTemplate" ColumnDefinitions="Auto,Auto,*" MinHeight="{DynamicResource SliderHorizontalHeight}">
 
                 <Grid.RowDefinitions>
                   <RowDefinition Height="{DynamicResource SliderPreContentMargin}" />
@@ -76,58 +59,98 @@
                 </Grid.RowDefinitions>
 
                 <!--
-              <TickBar x:Name="TopTickBar"
-                  Visibility="Collapsed"
-                  Fill="{DynamicResource SliderTickBarFill}"
-                  Height="{DynamicResource SliderOutsideTickBarThemeHeight}"
-                  VerticalAlignment="Bottom"
-                  Margin="0,0,0,4"
-                  Grid.ColumnSpan="3" />
-              <TickBar x:Name="HorizontalInlineTickBar"
-                  Visibility="Collapsed"
-                  Fill="{DynamicResource SliderInlineTickBarFill}"
-                  Height="{DynamicResource SliderTrackThemeHeight}"
-                  Grid.Row="1"
-                  Grid.ColumnSpan="3" />
-              <TickBar x:Name="BottomTickBar"
-                  Visibility="Collapsed"
-                  Fill="{DynamicResource SliderTickBarFill}"
-                  Height="{DynamicResource SliderOutsideTickBarThemeHeight}"
-                  VerticalAlignment="Top"
-                  Margin="0,4,0,0"
-                  Grid.Row="2"
-                  Grid.ColumnSpan="3" /> -->
-
-                <Track Name="PART_Track"
-                       Grid.Row="1"
-                       Grid.ColumnSpan="3"
-                       
-                       Orientation="Horizontal">
+                <TickBar x:Name="TopTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderTickBarFill}" Height="{DynamicResource SliderOutsideTickBarThemeHeight}" VerticalAlignment="Bottom" Margin="0,0,0,4" Grid.ColumnSpan="3" />
+                <TickBar x:Name="HorizontalInlineTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderInlineTickBarFill}" Height="{DynamicResource SliderTrackThemeHeight}" Grid.Row="1" Grid.ColumnSpan="3" />
+                <TickBar x:Name="BottomTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderTickBarFill}" Height="{DynamicResource SliderOutsideTickBarThemeHeight}" VerticalAlignment="Top" Margin="0,4,0,0" Grid.Row="2" Grid.ColumnSpan="3" />
+                -->
+
+                <Track Name="PART_Track" Grid.Row="1" Grid.ColumnSpan="3" Orientation="Horizontal">
+                  <Track.DecreaseButton>
+                    <RepeatButton Name="PART_DecreaseButton" Background="{TemplateBinding Foreground}">
+                      <RepeatButton.Template>
+                        <ControlTemplate>
+                          <Grid>
+                            <Border Name="FocusTarget" Background="Transparent" Margin="0,-10"/>
+                            <Border Name="TrackBackground" Background="{TemplateBinding Background}" CornerRadius="{DynamicResource ControlCornerRadius}" Height="{DynamicResource SliderTrackThemeHeight}" VerticalAlignment="Center"/>
+                          </Grid>
+                        </ControlTemplate>
+                      </RepeatButton.Template>
+                    </RepeatButton>
+                  </Track.DecreaseButton>
+                  <Track.IncreaseButton>
+                    <RepeatButton Name="PART_IncreaseButton" Background="{TemplateBinding Background}">
+                      <RepeatButton.Template>
+                        <ControlTemplate>
+                          <Grid>
+                            <Border Name="FocusTarget" Background="Transparent" Margin="0,-10"/>
+                            <Border Name="TrackBackground" Background="{TemplateBinding Background}" CornerRadius="{DynamicResource ControlCornerRadius}" Height="{DynamicResource SliderTrackThemeHeight}" VerticalAlignment="Center"/>
+                          </Grid>
+                        </ControlTemplate>
+                      </RepeatButton.Template>
+                    </RepeatButton>
+                  </Track.IncreaseButton>
+                  <Thumb Classes="SliderThumbStyle" Name="thumb" Margin="0" Padding="0" DataContext="{TemplateBinding Value}" Height="{DynamicResource SliderHorizontalThumbHeight}" Width="{DynamicResource SliderHorizontalThumbWidth}" />
+                </Track>
+              </Grid>
+            </Grid>
+          </Grid>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+  </Style>
+
+  <Style Selector="Slider:vertical">
+    <Setter Property="Background" Value="{DynamicResource SliderTrackFill}" />
+    <Setter Property="BorderThickness" Value="{DynamicResource SliderBorderThemeThickness}" />
+    <Setter Property="Foreground" Value="{DynamicResource SliderTrackValueFill}" />
+    <Setter Property="FontFamily" Value="{DynamicResource ContentControlThemeFontFamily}" />
+    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="{DynamicResource ControlCornerRadius}">
+          <Grid Name="grid" Margin="{TemplateBinding Padding}" RowDefinitions="Auto, *">
+            <ContentPresenter x:Name="HeaderContentPresenter" Grid.Row="0" TextBlock.FontWeight="{DynamicResource SliderHeaderThemeFontWeight}" TextBlock.Foreground="{DynamicResource SliderHeaderForeground}" Margin="{DynamicResource SliderTopHeaderMargin}" />
+            <Grid x:Name="SliderContainer" Grid.Row="1">
+              <Grid x:Name="VerticalTemplate" RowDefinitions="*,Auto,Auto" MinWidth="{DynamicResource SliderVerticalWidth}">
+
+                <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="{DynamicResource SliderPreContentMargin}" />
+                  <ColumnDefinition Width="Auto" />
+                  <ColumnDefinition Width="{DynamicResource SliderPostContentMargin}" />
+                </Grid.ColumnDefinitions>
+
+                <!-- 
+                <TickBar x:Name="LeftTickBar" Visibility="Collapsed" Fill="{ThemeResource SliderTickBarFill}" Width="{ThemeResource SliderOutsideTickBarThemeHeight}" HorizontalAlignment="Right" Margin="0,0,4,0" Grid.RowSpan="3" />
+                <TickBar x:Name="VerticalInlineTickBar" Visibility="Collapsed" Fill="{ThemeResource SliderInlineTickBarFill}" Width="{ThemeResource SliderTrackThemeHeight}" Grid.Column="1" Grid.RowSpan="3" />
+                <TickBar x:Name="RightTickBar" Visibility="Collapsed" Fill="{ThemeResource SliderTickBarFill}" Width="{ThemeResource SliderOutsideTickBarThemeHeight}" HorizontalAlignment="Left" Margin="4,0,0,0" Grid.Column="2" Grid.RowSpan="3" /> 
+                -->
+
+                <Track Name="PART_Track" Grid.Column="1" Grid.ColumnSpan="1" Grid.RowSpan="3" Orientation="Vertical">
                   <Track.DecreaseButton>
                     <RepeatButton Name="PART_DecreaseButton" Background="{TemplateBinding Foreground}">
                       <RepeatButton.Template>
                         <ControlTemplate>
-                          <Border Name="TrackBackground" Background="{TemplateBinding Background}" CornerRadius="{DynamicResource ControlCornerRadius}" Height="{DynamicResource SliderTrackThemeHeight}" VerticalAlignment="Center"/>
+                          <Grid>
+                            <Border Name="FocusTarget" Background="Transparent" Margin="0,-10"/>
+                            <Border Name="TrackBackground" Background="{TemplateBinding Background}" CornerRadius="{DynamicResource ControlCornerRadius}" Width="{DynamicResource SliderTrackThemeHeight}" HorizontalAlignment="Center"/>
+                          </Grid>
                         </ControlTemplate>
                       </RepeatButton.Template>
                     </RepeatButton>
                   </Track.DecreaseButton>
                   <Track.IncreaseButton>
-                    <RepeatButton Name="PART_IncreaseButton" Margin="0" Padding="0" Background="{TemplateBinding Background}"
-                                  Classes="repeattrack">
+                    <RepeatButton Name="PART_IncreaseButton" Background="{TemplateBinding Background}">
                       <RepeatButton.Template>
                         <ControlTemplate>
-                          <Border Name="TrackBackground" Background="{TemplateBinding Background}" CornerRadius="{DynamicResource ControlCornerRadius}" Height="{DynamicResource SliderTrackThemeHeight}" VerticalAlignment="Center"/>
+                          <Grid>
+                            <Border Name="FocusTarget" Background="Transparent" Margin="0,-10"/>
+                            <Border Name="TrackBackground" Background="{TemplateBinding Background}" CornerRadius="{DynamicResource ControlCornerRadius}" Width="{DynamicResource SliderTrackThemeHeight}" HorizontalAlignment="Center"/>
+                          </Grid>
                         </ControlTemplate>
                       </RepeatButton.Template>
                     </RepeatButton>
                   </Track.IncreaseButton>
-                  <Thumb Classes="SliderThumbStyle"
-                         Name="thumb"
-                         Margin="0" Padding="0"
-                         DataContext="{TemplateBinding Value}"
-                         Height="{DynamicResource SliderHorizontalThumbHeight}"
-                         Width="{DynamicResource SliderHorizontalThumbWidth}" />
+                  <Thumb Classes="SliderThumbStyle" Name="thumb" Margin="0" Padding="0" DataContext="{TemplateBinding Value}" Height="{DynamicResource SliderVerticalThumbHeight}" Width="{DynamicResource SliderVerticalThumbWidth}" />
                 </Track>
               </Grid>
             </Grid>

From 8abf6aae705cfa3df8065ab59782f292beac8260 Mon Sep 17 00:00:00 2001
From: Jumar Macato <hikari.netto23@gmail.com>
Date: Thu, 28 May 2020 11:39:59 +0800
Subject: [PATCH 15/45] Porting resources

---
 .../Accents/FluentBaseDark.xaml               | 26 ++++++++-
 .../Accents/FluentBaseLight.xaml              | 26 ++++++++-
 .../Accents/FluentControlResourcesDark.xaml   | 55 ++++++++++++++++++-
 .../Accents/FluentControlResourcesLight.xaml  | 55 ++++++++++++++++++-
 4 files changed, 154 insertions(+), 8 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Accents/FluentBaseDark.xaml b/src/Avalonia.Themes.Fluent/Accents/FluentBaseDark.xaml
index 9fe9f5389e..d9487ea39e 100644
--- a/src/Avalonia.Themes.Fluent/Accents/FluentBaseDark.xaml
+++ b/src/Avalonia.Themes.Fluent/Accents/FluentBaseDark.xaml
@@ -1,4 +1,6 @@
-<Style xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:sys="clr-namespace:System;assembly=netstandard">
+<Style xmlns="https://github.com/avaloniaui" 
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
+  xmlns:sys="clr-namespace:System;assembly=netstandard">
   <Style.Resources>
     <Color x:Key="SystemAccentColor">#FF0078D7</Color>
     <Color x:Key="SystemAltHighColor">#FF000000</Color>
@@ -247,5 +249,27 @@
     <StaticResource x:Key="RadioButtonCheckGlyphStrokePointerOver" ResourceKey="SystemControlTransparentBrush" />
     <StaticResource x:Key="RadioButtonCheckGlyphStrokePressed" ResourceKey="SystemControlTransparentBrush" />
     <StaticResource x:Key="RadioButtonCheckGlyphStrokeDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <!-- BaseResources for Slider.xaml -->
+    <StaticResource x:Key="SliderContainerBackground" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="SliderContainerBackgroundPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="SliderContainerBackgroundPressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="SliderContainerBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="SliderThumbBackground" ResourceKey="SystemControlForegroundAccentBrush" />
+    <StaticResource x:Key="SliderThumbBackgroundPointerOver" ResourceKey="SystemControlHighlightChromeAltLowBrush" />
+    <StaticResource x:Key="SliderThumbBackgroundPressed" ResourceKey="SystemControlHighlightChromeHighBrush" />
+    <StaticResource x:Key="SliderThumbBackgroundDisabled" ResourceKey="SystemControlDisabledChromeDisabledHighBrush" />
+    <StaticResource x:Key="SliderTrackFill" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
+    <StaticResource x:Key="SliderTrackFillPointerOver" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <StaticResource x:Key="SliderTrackFillPressed" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
+    <StaticResource x:Key="SliderTrackFillDisabled" ResourceKey="SystemControlDisabledChromeDisabledHighBrush" />
+    <StaticResource x:Key="SliderTrackValueFill" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="SliderTrackValueFillPointerOver" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="SliderTrackValueFillPressed" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="SliderTrackValueFillDisabled" ResourceKey="SystemControlDisabledChromeDisabledHighBrush" />
+    <StaticResource x:Key="SliderHeaderForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="SliderHeaderForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="SliderTickBarFill" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
+    <StaticResource x:Key="SliderTickBarFillDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="SliderInlineTickBarFill" ResourceKey="SystemControlBackgroundAltHighBrush" />
   </Style.Resources>
 </Style>
diff --git a/src/Avalonia.Themes.Fluent/Accents/FluentBaseLight.xaml b/src/Avalonia.Themes.Fluent/Accents/FluentBaseLight.xaml
index 87cc0d38a0..ba765dcb74 100644
--- a/src/Avalonia.Themes.Fluent/Accents/FluentBaseLight.xaml
+++ b/src/Avalonia.Themes.Fluent/Accents/FluentBaseLight.xaml
@@ -1,4 +1,6 @@
-<Style xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:sys="clr-namespace:System;assembly=netstandard">
+<Style xmlns="https://github.com/avaloniaui" 
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
+  xmlns:sys="clr-namespace:System;assembly=netstandard">
   <Style.Resources>
     <Color x:Key="SystemAccentColor">#FF0078D7</Color>
     <Color x:Key="SystemAltHighColor">#FFFFFFFF</Color>
@@ -247,5 +249,27 @@
     <StaticResource x:Key="RadioButtonCheckGlyphStrokePointerOver" ResourceKey="SystemControlTransparentBrush" />
     <StaticResource x:Key="RadioButtonCheckGlyphStrokePressed" ResourceKey="SystemControlTransparentBrush" />
     <StaticResource x:Key="RadioButtonCheckGlyphStrokeDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <!-- BaseResources for Slider.xaml -->
+    <StaticResource x:Key="SliderContainerBackground" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="SliderContainerBackgroundPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="SliderContainerBackgroundPressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="SliderContainerBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="SliderThumbBackground" ResourceKey="SystemControlForegroundAccentBrush" />
+    <StaticResource x:Key="SliderThumbBackgroundPointerOver" ResourceKey="SystemControlHighlightChromeAltLowBrush" />
+    <StaticResource x:Key="SliderThumbBackgroundPressed" ResourceKey="SystemControlHighlightChromeHighBrush" />
+    <StaticResource x:Key="SliderThumbBackgroundDisabled" ResourceKey="SystemControlDisabledChromeDisabledHighBrush" />
+    <StaticResource x:Key="SliderTrackFill" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
+    <StaticResource x:Key="SliderTrackFillPointerOver" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <StaticResource x:Key="SliderTrackFillPressed" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
+    <StaticResource x:Key="SliderTrackFillDisabled" ResourceKey="SystemControlDisabledChromeDisabledHighBrush" />
+    <StaticResource x:Key="SliderTrackValueFill" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="SliderTrackValueFillPointerOver" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="SliderTrackValueFillPressed" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="SliderTrackValueFillDisabled" ResourceKey="SystemControlDisabledChromeDisabledHighBrush" />
+    <StaticResource x:Key="SliderHeaderForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="SliderHeaderForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="SliderTickBarFill" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
+    <StaticResource x:Key="SliderTickBarFillDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="SliderInlineTickBarFill" ResourceKey="SystemControlBackgroundAltHighBrush" />
   </Style.Resources>
 </Style>
diff --git a/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesDark.xaml b/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesDark.xaml
index f09569e613..70a9fcacef 100644
--- a/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesDark.xaml
+++ b/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesDark.xaml
@@ -1,6 +1,6 @@
-<Style xmlns="https://github.com/avaloniaui"
-       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-       xmlns:sys="clr-namespace:System;assembly=netstandard">
+<Style xmlns="https://github.com/avaloniaui" 
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
+  xmlns:sys="clr-namespace:System;assembly=netstandard">
   <Style.Resources>
     <!-- Resources for Button.xaml -->
     <StaticResource x:Key="AccentButtonBackground" ResourceKey="SystemControlBackgroundAccentBrush" />
@@ -225,5 +225,54 @@
     <SolidColorBrush x:Key="RadioButtonPressedBorderThemeBrush" Color="#FFFFFFFF" />
     <SolidColorBrush x:Key="RadioButtonPressedForegroundThemeBrush" Color="#FF000000" />
     <SolidColorBrush x:Key="RadioButtonContentPointerOverForegroundThemeBrush" Color="{DynamicResource SystemColorHighlightTextColor}" />
+    <!-- Resources for Slider.xaml -->
+    <x:Double x:Key="SliderOutsideTickBarThemeHeight">4</x:Double>
+    <x:Double x:Key="SliderTrackThemeHeight">2</x:Double>
+    <Thickness x:Key="SliderBorderThemeThickness">0</Thickness>
+    <Thickness x:Key="SliderHeaderThemeMargin">0,0,0,4</Thickness>
+    <FontWeight x:Key="SliderHeaderThemeFontWeight">Normal</FontWeight>
+    <StaticResource x:Key="SliderContainerBackground" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="SliderContainerBackgroundPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="SliderContainerBackgroundPressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="SliderContainerBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="SliderThumbBackground" ResourceKey="SystemControlForegroundAccentBrush" />
+    <StaticResource x:Key="SliderThumbBackgroundPointerOver" ResourceKey="SystemAccentColorLight1" />
+    <StaticResource x:Key="SliderThumbBackgroundPressed" ResourceKey="SystemAccentColorDark1" />
+    <StaticResource x:Key="SliderThumbBackgroundDisabled" ResourceKey="SystemControlDisabledChromeDisabledHighBrush" />
+    <StaticResource x:Key="SliderTrackFill" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
+    <StaticResource x:Key="SliderTrackFillPointerOver" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <StaticResource x:Key="SliderTrackFillPressed" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
+    <StaticResource x:Key="SliderTrackFillDisabled" ResourceKey="SystemControlDisabledChromeDisabledHighBrush" />
+    <StaticResource x:Key="SliderTrackValueFill" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="SliderTrackValueFillPointerOver" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="SliderTrackValueFillPressed" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="SliderTrackValueFillDisabled" ResourceKey="SystemControlDisabledChromeDisabledHighBrush" />
+    <StaticResource x:Key="SliderHeaderForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="SliderHeaderForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="SliderTickBarFill" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
+    <StaticResource x:Key="SliderTickBarFillDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="SliderInlineTickBarFill" ResourceKey="SystemControlBackgroundAltHighBrush" />
+    <SolidColorBrush x:Key="SliderBorderThemeBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="SliderDisabledBorderThemeBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="SliderThumbBackgroundThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="SliderThumbBorderThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="SliderThumbDisabledBackgroundThemeBrush" Color="#FF7E7E7E" />
+    <SolidColorBrush x:Key="SliderThumbPointerOverBackgroundThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="SliderThumbPointerOverBorderThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="SliderThumbPressedBackgroundThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="SliderThumbPressedBorderThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="SliderTickMarkInlineBackgroundThemeBrush" Color="Black" />
+    <SolidColorBrush x:Key="SliderTickMarkInlineDisabledForegroundThemeBrush" Color="Black" />
+    <SolidColorBrush x:Key="SliderTickmarkOutsideBackgroundThemeBrush" Color="#80FFFFFF" />
+    <SolidColorBrush x:Key="SliderTickMarkOutsideDisabledForegroundThemeBrush" Color="#80FFFFFF" />
+    <SolidColorBrush x:Key="SliderTrackBackgroundThemeBrush" Color="#29FFFFFF" />
+    <SolidColorBrush x:Key="SliderTrackDecreaseBackgroundThemeBrush" Color="#FF5B2EC5" />
+    <SolidColorBrush x:Key="SliderTrackDecreaseDisabledBackgroundThemeBrush" Color="#1FFFFFFF" />
+    <SolidColorBrush x:Key="SliderTrackDecreasePointerOverBackgroundThemeBrush" Color="#FF724BCD" />
+    <SolidColorBrush x:Key="SliderTrackDecreasePressedBackgroundThemeBrush" Color="#FF8152EF" />
+    <SolidColorBrush x:Key="SliderTrackDisabledBackgroundThemeBrush" Color="#29FFFFFF" />
+    <SolidColorBrush x:Key="SliderTrackPointerOverBackgroundThemeBrush" Color="#46FFFFFF" />
+    <SolidColorBrush x:Key="SliderTrackPressedBackgroundThemeBrush" Color="#59FFFFFF" />
+    <SolidColorBrush x:Key="SliderHeaderForegroundThemeBrush" Color="#FFFFFFFF" />
   </Style.Resources>
 </Style>
diff --git a/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesLight.xaml b/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesLight.xaml
index 97497495be..90179184f5 100644
--- a/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesLight.xaml
+++ b/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesLight.xaml
@@ -1,6 +1,6 @@
-<Style xmlns="https://github.com/avaloniaui"
-       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-       xmlns:sys="clr-namespace:System;assembly=netstandard">
+<Style xmlns="https://github.com/avaloniaui" 
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
+  xmlns:sys="clr-namespace:System;assembly=netstandard">
   <Style.Resources>
     <!-- Resources for Button.xaml -->
     <StaticResource x:Key="AccentButtonBackground" ResourceKey="SystemControlBackgroundAccentBrush" />
@@ -225,5 +225,54 @@
     <SolidColorBrush x:Key="RadioButtonPressedBorderThemeBrush" Color="#FF000000" />
     <SolidColorBrush x:Key="RadioButtonPressedForegroundThemeBrush" Color="#FFFFFFFF" />
     <SolidColorBrush x:Key="RadioButtonContentPointerOverForegroundThemeBrush" Color="{DynamicResource SystemColorHighlightTextColor}" />
+    <!-- Resources for Slider.xaml -->
+    <x:Double x:Key="SliderOutsideTickBarThemeHeight">4</x:Double>
+    <x:Double x:Key="SliderTrackThemeHeight">2</x:Double>
+    <Thickness x:Key="SliderBorderThemeThickness">0</Thickness>
+    <Thickness x:Key="SliderHeaderThemeMargin">0,0,0,4</Thickness>
+    <FontWeight x:Key="SliderHeaderThemeFontWeight">Normal</FontWeight>
+    <StaticResource x:Key="SliderContainerBackground" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="SliderContainerBackgroundPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="SliderContainerBackgroundPressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="SliderContainerBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="SliderThumbBackground" ResourceKey="SystemControlForegroundAccentBrush" />
+    <StaticResource x:Key="SliderThumbBackgroundPointerOver" ResourceKey="SystemAccentColorLight1" />
+    <StaticResource x:Key="SliderThumbBackgroundPressed" ResourceKey="SystemAccentColorDark1" />
+    <StaticResource x:Key="SliderThumbBackgroundDisabled" ResourceKey="SystemControlDisabledChromeDisabledHighBrush" />
+    <StaticResource x:Key="SliderTrackFill" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
+    <StaticResource x:Key="SliderTrackFillPointerOver" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <StaticResource x:Key="SliderTrackFillPressed" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
+    <StaticResource x:Key="SliderTrackFillDisabled" ResourceKey="SystemControlDisabledChromeDisabledHighBrush" />
+    <StaticResource x:Key="SliderTrackValueFill" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="SliderTrackValueFillPointerOver" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="SliderTrackValueFillPressed" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="SliderTrackValueFillDisabled" ResourceKey="SystemControlDisabledChromeDisabledHighBrush" />
+    <StaticResource x:Key="SliderHeaderForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="SliderHeaderForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="SliderTickBarFill" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
+    <StaticResource x:Key="SliderTickBarFillDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="SliderInlineTickBarFill" ResourceKey="SystemControlBackgroundAltHighBrush" />
+    <SolidColorBrush x:Key="SliderBorderThemeBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="SliderDisabledBorderThemeBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="SliderThumbBackgroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="SliderThumbBorderThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="SliderThumbDisabledBackgroundThemeBrush" Color="#FF929292" />
+    <SolidColorBrush x:Key="SliderThumbPointerOverBackgroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="SliderThumbPointerOverBorderThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="SliderThumbPressedBackgroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="SliderThumbPressedBorderThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="SliderTickMarkInlineBackgroundThemeBrush" Color="White" />
+    <SolidColorBrush x:Key="SliderTickMarkInlineDisabledForegroundThemeBrush" Color="White" />
+    <SolidColorBrush x:Key="SliderTickmarkOutsideBackgroundThemeBrush" Color="#80000000" />
+    <SolidColorBrush x:Key="SliderTickMarkOutsideDisabledForegroundThemeBrush" Color="#80000000" />
+    <SolidColorBrush x:Key="SliderTrackBackgroundThemeBrush" Color="#1A000000" />
+    <SolidColorBrush x:Key="SliderTrackDecreaseBackgroundThemeBrush" Color="#FF4617B4" />
+    <SolidColorBrush x:Key="SliderTrackDecreaseDisabledBackgroundThemeBrush" Color="#1C000000" />
+    <SolidColorBrush x:Key="SliderTrackDecreasePointerOverBackgroundThemeBrush" Color="#FF5F37BE" />
+    <SolidColorBrush x:Key="SliderTrackDecreasePressedBackgroundThemeBrush" Color="#FF7241E4" />
+    <SolidColorBrush x:Key="SliderTrackDisabledBackgroundThemeBrush" Color="#1A000000" />
+    <SolidColorBrush x:Key="SliderTrackPointerOverBackgroundThemeBrush" Color="#26000000" />
+    <SolidColorBrush x:Key="SliderTrackPressedBackgroundThemeBrush" Color="#33000000" />
+    <SolidColorBrush x:Key="SliderHeaderForegroundThemeBrush" Color="#FF000000" />
   </Style.Resources>
 </Style>

From 6005d3fdbfaaa6fab47cf471faff348d72420dd4 Mon Sep 17 00:00:00 2001
From: Jumar Macato <hikari.netto23@gmail.com>
Date: Thu, 28 May 2020 12:04:45 +0800
Subject: [PATCH 16/45] WIP

---
 src/Avalonia.Themes.Default/Slider.xaml | 329 ++++++++++++++++++------
 1 file changed, 246 insertions(+), 83 deletions(-)

diff --git a/src/Avalonia.Themes.Default/Slider.xaml b/src/Avalonia.Themes.Default/Slider.xaml
index b21cbf3650..f9857be906 100644
--- a/src/Avalonia.Themes.Default/Slider.xaml
+++ b/src/Avalonia.Themes.Default/Slider.xaml
@@ -1,93 +1,256 @@
-<Styles xmlns="https://github.com/avaloniaui">
-  <Style Selector="Slider:horizontal">
-    <Setter Property="MinWidth" Value="40"/>
-    <Setter Property="MinHeight" Value="20"/>
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Grid Name="grid">
-          <Grid.RowDefinitions>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="Auto" MinHeight="20"/>
-            <RowDefinition Height="Auto"/>
-          </Grid.RowDefinitions>
-          <Border Name="TrackBackground" Grid.Row="1" Height="4" Margin="6,0" VerticalAlignment="Center"/>
-          <Track Name="PART_Track" Grid.Row="1" Orientation="Horizontal">
-            <Track.DecreaseButton>
-               <RepeatButton Name="PART_DecreaseButton"
-                             Classes="repeattrack" />
-            </Track.DecreaseButton>
-            <Track.IncreaseButton>
-               <RepeatButton Name="PART_IncreaseButton"
-                             Classes="repeattrack" />
-            </Track.IncreaseButton>
-            <Thumb Name="thumb" MinWidth="20" MinHeight="20">
-              <Thumb.Template>
-                <ControlTemplate>
-                  <Grid>
-                    <Ellipse Width="12" Height="12" Fill="{DynamicResource ThemeAccentBrush}"/>
-                  </Grid>
-                </ControlTemplate>
-              </Thumb.Template>
-            </Thumb>
-          </Track>
-        </Grid>
-      </ControlTemplate>
-    </Setter>
+<Styles xmlns="https://github.com/avaloniaui" 
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <Styles.Resources>
+    <Thickness x:Key="SliderTopHeaderMargin">0,0,0,4</Thickness>
+    <x:Double x:Key="SliderPreContentMargin">15</x:Double>
+    <x:Double x:Key="SliderPostContentMargin">15</x:Double>
+    <x:Double x:Key="SliderHorizontalHeight">32</x:Double>
+    <x:Double x:Key="SliderVerticalWidth">32</x:Double>
+    <x:Double x:Key="SliderThumbCornerRadius">10</x:Double>
+    <x:Double x:Key="SliderHorizontalThumbWidth">20</x:Double>
+    <x:Double x:Key="SliderHorizontalThumbHeight">20</x:Double>
+    <x:Double x:Key="SliderVerticalThumbWidth">20</x:Double>
+    <x:Double x:Key="SliderVerticalThumbHeight">20</x:Double>
+  </Styles.Resources>
+
+
+  <!-- Disabled State -->
+  <Style Selector="Slider:disabled /template/ ContentPresenter#HeaderContentPresenter">
+    <Setter Property="Foreground" Value="{DynamicResource SliderHeaderForegroundDisabled}" />
   </Style>
-  <Style Selector="Slider:vertical">
-    <Setter Property="MinWidth" Value="20"/>
-    <Setter Property="MinHeight" Value="40"/>
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Grid>
-          <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="Auto"/>
-            <ColumnDefinition Width="Auto" MinWidth="26"/>
-            <ColumnDefinition Width="Auto"/>
-          </Grid.ColumnDefinitions>
-          <Border Name="TrackBackground" Grid.Column="1" Width="4" Margin="0,6" HorizontalAlignment="Center"/>
-          <Track Name="PART_Track" Grid.Column="1" Orientation="Vertical" IsDirectionReversed="True">
-            <Track.DecreaseButton>
-               <RepeatButton Name="PART_DecreaseButton"
-                             Classes="repeattrack" />
-            </Track.DecreaseButton>
-            <Track.IncreaseButton>
-               <RepeatButton Name="PART_IncreaseButton"
-                             Classes="repeattrack" />
-            </Track.IncreaseButton>
-            <Thumb Name="thumb" MinWidth="20" MinHeight="20">
-              <Thumb.Template>
-                <ControlTemplate>
-                  <Grid>
-                    <Ellipse Width="12" Height="12" Fill="{DynamicResource ThemeAccentBrush}"/>
-                  </Grid>
-                </ControlTemplate>
-              </Thumb.Template>
-            </Thumb>
-          </Track>
-        </Grid>
-      </ControlTemplate>
-    </Setter>
+  <Style Selector="Slider:disabled /template/ Rectangle#HorizontalDecreaseRect">
+    <Setter Property="Fill" Value="{DynamicResource SliderTrackValueFillDisabled}" />
+  </Style>
+  <Style Selector="Slider:disabled /template/ Rectangle#HorizontalTrackRect">
+    <Setter Property="Fill" Value="{DynamicResource SliderTrackFillDisabled}" />
+  </Style>
+  <Style Selector="Slider:disabled /template/ Rectangle#VerticalDecreaseRect">
+    <Setter Property="Fill" Value="{DynamicResource SliderTrackValueFillDisabled}" />
+  </Style>
+  <Style Selector="Slider:disabled /template/ Rectangle#VerticalTrackRect">
+    <Setter Property="Fill" Value="{DynamicResource SliderTrackFillDisabled}" />
   </Style>
-  <Style Selector="Slider /template/ Track#PART_Track">
-    <Setter Property="Minimum" Value="{TemplateBinding Minimum}"/>
-    <Setter Property="Maximum" Value="{TemplateBinding Maximum}"/>
-    <Setter Property="Value" Value="{TemplateBinding Value, Mode=TwoWay}"/>
+  <Style Selector="Slider:disabled /template/ Thumb#HorizontalThumb">
+    <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundDisabled}" />
   </Style>
-  <Style Selector="Slider /template/ Border#TrackBackground">
-    <Setter Property="BorderThickness" Value="2"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderLowBrush}"/>
+  <Style Selector="Slider:disabled /template/ Thumb#HorizontalThumb">
+    <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundDisabled}" />
   </Style>
-  <Style Selector="Slider /template/ RepeatButton.repeattrack">
-    <Setter Property="Background" Value="Transparent"/>
-    <Setter Property="Foreground" Value="{DynamicResource ThemeBorderLowBrush}"/>
+
+
+      <VisualState x:Name="Disabled">
+
+        <Storyboard>  
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="" Storyboard.TargetProperty="">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource }" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalThumb" Storyboard.TargetProperty="Background">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource }" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="TopTickBar" Storyboard.TargetProperty="Fill">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTickBarFillDisabled}" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BottomTickBar" Storyboard.TargetProperty="Fill">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTickBarFillDisabled}" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="LeftTickBar" Storyboard.TargetProperty="Fill">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTickBarFillDisabled}" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RightTickBar" Storyboard.TargetProperty="Fill">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTickBarFillDisabled}" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SliderContainer" Storyboard.TargetProperty="Background">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderContainerBackgroundDisabled}" />
+          </ObjectAnimationUsingKeyFrames>
+        </Storyboard>
+      </VisualState>
+
+
+  <VisualStateManager.VisualStateGroups>
+    <VisualStateGroup x:Name="CommonStates">
+      <VisualState x:Name="Normal" />
+
+      <VisualState x:Name="Pressed">
+
+        <Storyboard>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HorizontalTrackRect" Storyboard.TargetProperty="Fill">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTrackFillPressed}" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalTrackRect" Storyboard.TargetProperty="Fill">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTrackFillPressed}" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HorizontalThumb" Storyboard.TargetProperty="Background">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderThumbBackgroundPressed}" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalThumb" Storyboard.TargetProperty="Background">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderThumbBackgroundPressed}" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SliderContainer" Storyboard.TargetProperty="Background">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderContainerBackgroundPressed}" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HorizontalDecreaseRect" Storyboard.TargetProperty="Fill">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTrackValueFillPressed}" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalDecreaseRect" Storyboard.TargetProperty="Fill">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTrackValueFillPressed}" />
+          </ObjectAnimationUsingKeyFrames>
+        </Storyboard>
+      </VisualState>
+
+
+      <VisualState x:Name="PointerOver">
+
+        <Storyboard>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HorizontalTrackRect" Storyboard.TargetProperty="Fill">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTrackFillPointerOver}" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalTrackRect" Storyboard.TargetProperty="Fill">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTrackFillPointerOver}" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HorizontalThumb" Storyboard.TargetProperty="Background">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderThumbBackgroundPointerOver}" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalThumb" Storyboard.TargetProperty="Background">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderThumbBackgroundPointerOver}" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SliderContainer" Storyboard.TargetProperty="Background">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderContainerBackgroundPointerOver}" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HorizontalDecreaseRect" Storyboard.TargetProperty="Fill">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTrackValueFillPointerOver}" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalDecreaseRect" Storyboard.TargetProperty="Fill">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTrackValueFillPointerOver}" />
+          </ObjectAnimationUsingKeyFrames>
+        </Storyboard>
+      </VisualState>
+
+    </VisualStateGroup>
+    <VisualStateGroup x:Name="FocusEngagementStates">
+      <VisualState x:Name="FocusDisengaged" />
+      <VisualState x:Name="FocusEngagedHorizontal">
+
+        <Storyboard>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SliderContainer" Storyboard.TargetProperty="(Control.IsTemplateFocusTarget)">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="False" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HorizontalThumb" Storyboard.TargetProperty="(Control.IsTemplateFocusTarget)">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="True" />
+          </ObjectAnimationUsingKeyFrames>
+        </Storyboard>
+      </VisualState>
+      <VisualState x:Name="FocusEngagedVertical">
+
+        <Storyboard>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SliderContainer" Storyboard.TargetProperty="(Control.IsTemplateFocusTarget)">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="False" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalThumb" Storyboard.TargetProperty="(Control.IsTemplateFocusTarget)">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="True" />
+          </ObjectAnimationUsingKeyFrames>
+        </Storyboard>
+      </VisualState>
+
+    </VisualStateGroup>
+
+  </VisualStateManager.VisualStateGroups>
+
+
+
+  <Style Selector="Slider">
+    <Setter Property="Background" Value="{DynamicResource SliderTrackFill}" />
+    <Setter Property="BorderThickness" Value="{DynamicResource SliderBorderThemeThickness}" />
+    <Setter Property="Foreground" Value="{DynamicResource SliderTrackValueFill}" />
+    <Setter Property="FontFamily" Value="{DynamicResource ContentControlThemeFontFamily}" />
+    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+    <Setter Property="ManipulationMode" Value="None" />
+    <Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
+    <Setter Property="FocusVisualMargin" Value="-7,0,-7,0" />
+    <Setter Property="IsFocusEngagementEnabled" Value="True" />
+    <!-- NOTE: This was a contract7Present:Setter, not sure if this is correct -->
+    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
     <Setter Property="Template">
+      <Setter.Value>
         <ControlTemplate>
-            <Border Background="{TemplateBinding Background}" />
+          <Grid Margin="{TemplateBinding Padding}">
+            <Grid.Resources>
+              <Style TargetType="Thumb" x:Key="SliderThumbStyle">
+                <Setter Property="BorderThickness" Value="0" />
+                <Setter Property="Background" Value="{DynamicResource SliderThumbBackground}" />
+                <Setter Property="Template">
+                  <Setter.Value>
+                    <ControlTemplate TargetType="Thumb">
+                      <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{DynamicResource SliderThumbCornerRadius}" />
+                    </ControlTemplate>
+                  </Setter.Value>
+                </Setter>
+              </Style>
+            </Grid.Resources>
+
+            <Grid.RowDefinitions>
+              <RowDefinition Height="Auto" />
+              <RowDefinition Height="*" />
+            </Grid.RowDefinitions>
+
+            <ContentPresenter x:Name="HeaderContentPresenter" Grid.Row="0" Content="{TemplateBinding Header}" ContentTemplate="{TemplateBinding HeaderTemplate}" FontWeight="{DynamicResource SliderHeaderThemeFontWeight}" Foreground="{DynamicResource SliderHeaderForeground}" Margin="{DynamicResource SliderTopHeaderMargin}" TextWrapping="Wrap" Visibility="Collapsed" x:DeferLoadStrategy="Lazy"/>
+            <Grid x:Name="SliderContainer" Grid.Row="1" Background="{DynamicResource SliderContainerBackground}" Control.IsTemplateFocusTarget="True">
+              <Grid x:Name="HorizontalTemplate" MinHeight="{DynamicResource SliderHorizontalHeight}">
+
+                <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="Auto" />
+                  <ColumnDefinition Width="Auto" />
+                  <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
+
+                <Grid.RowDefinitions>
+                  <RowDefinition Height="{DynamicResource SliderPreContentMargin}" />
+                  <RowDefinition Height="Auto" />
+                  <RowDefinition Height="{DynamicResource SliderPostContentMargin}" />
+                </Grid.RowDefinitions>
+
+                <Rectangle x:Name="HorizontalTrackRect" Fill="{TemplateBinding Background}" Height="{DynamicResource SliderTrackThemeHeight}" Grid.Row="1" Grid.ColumnSpan="3" contract7Present:RadiusX="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7Present:RadiusY="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusX="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusY="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" />
+                <Rectangle x:Name="HorizontalDecreaseRect" Fill="{TemplateBinding Foreground}" Grid.Row="1" contract7Present:RadiusX="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7Present:RadiusY="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusX="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusY="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" />
+                <TickBar x:Name="TopTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderTickBarFill}" Height="{DynamicResource SliderOutsideTickBarThemeHeight}" VerticalAlignment="Bottom" Margin="0,0,0,4" Grid.ColumnSpan="3" />
+                <TickBar x:Name="HorizontalInlineTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderInlineTickBarFill}" Height="{DynamicResource SliderTrackThemeHeight}" Grid.Row="1" Grid.ColumnSpan="3" />
+                <TickBar x:Name="BottomTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderTickBarFill}" Height="{DynamicResource SliderOutsideTickBarThemeHeight}" VerticalAlignment="Top" Margin="0,4,0,0" Grid.Row="2" Grid.ColumnSpan="3" />
+                <Thumb x:Name="HorizontalThumb" Style="{StaticResource SliderThumbStyle}" DataContext="{TemplateBinding Value}" Height="{DynamicResource SliderHorizontalThumbHeight}" Width="{DynamicResource SliderHorizontalThumbWidth}" Grid.Row="0" Grid.RowSpan="3" Grid.Column="1" FocusVisualMargin="-14,-6,-14,-6" AutomationProperties.AccessibilityView="Raw" />
+              </Grid>
+              <Grid x:Name="VerticalTemplate" MinWidth="{DynamicResource SliderVerticalWidth}" Visibility="Collapsed">
+
+                <Grid.RowDefinitions>
+                  <RowDefinition Height="*" />
+                  <RowDefinition Height="Auto" />
+                  <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+
+                <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="{DynamicResource SliderPreContentMargin}" />
+                  <ColumnDefinition Width="Auto" />
+                  <ColumnDefinition Width="{DynamicResource SliderPostContentMargin}" />
+                </Grid.ColumnDefinitions>
+
+                <Rectangle x:Name="VerticalTrackRect" Fill="{TemplateBinding Background}" Width="{DynamicResource SliderTrackThemeHeight}" Grid.Column="1" Grid.RowSpan="3" contract7Present:RadiusX="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7Present:RadiusY="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusX="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusY="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" />
+                <Rectangle x:Name="VerticalDecreaseRect" Fill="{TemplateBinding Foreground}" Grid.Column="1" Grid.Row="2" contract7Present:RadiusX="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7Present:RadiusY="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusX="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusY="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" />
+                <TickBar x:Name="LeftTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderTickBarFill}" Width="{DynamicResource SliderOutsideTickBarThemeHeight}" HorizontalAlignment="Right" Margin="0,0,4,0" Grid.RowSpan="3" />
+                <TickBar x:Name="VerticalInlineTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderInlineTickBarFill}" Width="{DynamicResource SliderTrackThemeHeight}" Grid.Column="1" Grid.RowSpan="3" />
+                <TickBar x:Name="RightTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderTickBarFill}" Width="{DynamicResource SliderOutsideTickBarThemeHeight}" HorizontalAlignment="Left" Margin="4,0,0,0" Grid.Column="2" Grid.RowSpan="3" />
+                <Thumb x:Name="VerticalThumb" Style="{StaticResource SliderThumbStyle}" DataContext="{TemplateBinding Value}" Width="{DynamicResource SliderVerticalThumbWidth}" Height="{DynamicResource SliderVerticalThumbHeight}" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="3" FocusVisualMargin="-6,-14,-6,-14" AutomationProperties.AccessibilityView="Raw" />
+              </Grid>
+
+            </Grid>
+
+          </Grid>
+
         </ControlTemplate>
+      </Setter.Value>
     </Setter>
   </Style>
-    <Style Selector="Slider:disabled /template/ Grid#grid">
-        <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}" />
-    </Style>
+
 </Styles>
+
+
+
+
+
+
+    

From 703ff980949fe896284e5dbdf5e163719a6f6a31 Mon Sep 17 00:00:00 2001
From: Jumar Macato <hikari.netto23@gmail.com>
Date: Thu, 28 May 2020 12:12:26 +0800
Subject: [PATCH 17/45] swap

---
 src/Avalonia.Themes.Default/Slider.xaml | 331 ++++++------------------
 src/Avalonia.Themes.Fluent/Slider.xaml  | 329 +++++++++++++++++------
 2 files changed, 330 insertions(+), 330 deletions(-)

diff --git a/src/Avalonia.Themes.Default/Slider.xaml b/src/Avalonia.Themes.Default/Slider.xaml
index f9857be906..9196663dd0 100644
--- a/src/Avalonia.Themes.Default/Slider.xaml
+++ b/src/Avalonia.Themes.Default/Slider.xaml
@@ -1,256 +1,93 @@
-<Styles xmlns="https://github.com/avaloniaui" 
-  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-  <Styles.Resources>
-    <Thickness x:Key="SliderTopHeaderMargin">0,0,0,4</Thickness>
-    <x:Double x:Key="SliderPreContentMargin">15</x:Double>
-    <x:Double x:Key="SliderPostContentMargin">15</x:Double>
-    <x:Double x:Key="SliderHorizontalHeight">32</x:Double>
-    <x:Double x:Key="SliderVerticalWidth">32</x:Double>
-    <x:Double x:Key="SliderThumbCornerRadius">10</x:Double>
-    <x:Double x:Key="SliderHorizontalThumbWidth">20</x:Double>
-    <x:Double x:Key="SliderHorizontalThumbHeight">20</x:Double>
-    <x:Double x:Key="SliderVerticalThumbWidth">20</x:Double>
-    <x:Double x:Key="SliderVerticalThumbHeight">20</x:Double>
-  </Styles.Resources>
-
-
-  <!-- Disabled State -->
-  <Style Selector="Slider:disabled /template/ ContentPresenter#HeaderContentPresenter">
-    <Setter Property="Foreground" Value="{DynamicResource SliderHeaderForegroundDisabled}" />
-  </Style>
-  <Style Selector="Slider:disabled /template/ Rectangle#HorizontalDecreaseRect">
-    <Setter Property="Fill" Value="{DynamicResource SliderTrackValueFillDisabled}" />
-  </Style>
-  <Style Selector="Slider:disabled /template/ Rectangle#HorizontalTrackRect">
-    <Setter Property="Fill" Value="{DynamicResource SliderTrackFillDisabled}" />
-  </Style>
-  <Style Selector="Slider:disabled /template/ Rectangle#VerticalDecreaseRect">
-    <Setter Property="Fill" Value="{DynamicResource SliderTrackValueFillDisabled}" />
+<Styles xmlns="https://github.com/avaloniaui">
+  <Style Selector="Slider:horizontal">
+    <Setter Property="MinWidth" Value="40"/>
+    <Setter Property="MinHeight" Value="20"/>
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Grid Name="grid">
+          <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto" MinHeight="20"/>
+            <RowDefinition Height="Auto"/>
+          </Grid.RowDefinitions>
+          <Border Name="TrackBackground" Grid.Row="1" Height="4" Margin="6,0" VerticalAlignment="Center"/>
+          <Track Name="PART_Track" Grid.Row="1" Orientation="Horizontal">
+            <Track.DecreaseButton>
+               <RepeatButton Name="PART_DecreaseButton"
+                             Classes="repeattrack" />
+            </Track.DecreaseButton>
+            <Track.IncreaseButton>
+               <RepeatButton Name="PART_IncreaseButton"
+                             Classes="repeattrack" />
+            </Track.IncreaseButton>
+            <Thumb Name="thumb" MinWidth="20" MinHeight="20">
+              <Thumb.Template>
+                <ControlTemplate>
+                  <Grid>
+                    <Ellipse Width="12" Height="12" Fill="{DynamicResource ThemeAccentBrush}"/>
+                  </Grid>
+                </ControlTemplate>
+              </Thumb.Template>
+            </Thumb>
+          </Track>
+        </Grid>
+      </ControlTemplate>
+    </Setter>
   </Style>
-  <Style Selector="Slider:disabled /template/ Rectangle#VerticalTrackRect">
-    <Setter Property="Fill" Value="{DynamicResource SliderTrackFillDisabled}" />
+  <Style Selector="Slider:vertical">
+    <Setter Property="MinWidth" Value="20"/>
+    <Setter Property="MinHeight" Value="40"/>
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Grid>
+          <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="Auto" MinWidth="26"/>
+            <ColumnDefinition Width="Auto"/>
+          </Grid.ColumnDefinitions>
+          <Border Name="TrackBackground" Grid.Column="1" Width="4" Margin="0,6" HorizontalAlignment="Center"/>
+          <Track Name="PART_Track" Grid.Column="1" Orientation="Vertical" IsDirectionReversed="True">
+            <Track.DecreaseButton>
+               <RepeatButton Name="PART_DecreaseButton"
+                             Classes="repeattrack" />
+            </Track.DecreaseButton>
+            <Track.IncreaseButton>
+               <RepeatButton Name="PART_IncreaseButton"
+                             Classes="repeattrack" />
+            </Track.IncreaseButton>
+            <Thumb Name="thumb" MinWidth="20" MinHeight="20">
+              <Thumb.Template>
+                <ControlTemplate>
+                  <Grid>
+                    <Ellipse Width="12" Height="12" Fill="{DynamicResource ThemeAccentBrush}"/>
+                  </Grid>
+                </ControlTemplate>
+              </Thumb.Template>
+            </Thumb>
+          </Track>
+        </Grid>
+      </ControlTemplate>
+    </Setter>
   </Style>
-  <Style Selector="Slider:disabled /template/ Thumb#HorizontalThumb">
-    <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundDisabled}" />
+  <Style Selector="Slider /template/ Track#PART_Track">
+    <Setter Property="Minimum" Value="{TemplateBinding Minimum}"/>
+    <Setter Property="Maximum" Value="{TemplateBinding Maximum}"/>
+    <Setter Property="Value" Value="{TemplateBinding Value, Mode=TwoWay}"/>
   </Style>
-  <Style Selector="Slider:disabled /template/ Thumb#HorizontalThumb">
-    <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundDisabled}" />
+  <Style Selector="Slider /template/ Border#TrackBackground">
+    <Setter Property="BorderThickness" Value="2"/>
+    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderLowBrush}"/>
   </Style>
-
-
-      <VisualState x:Name="Disabled">
-
-        <Storyboard>  
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="" Storyboard.TargetProperty="">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource }" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalThumb" Storyboard.TargetProperty="Background">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource }" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="TopTickBar" Storyboard.TargetProperty="Fill">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTickBarFillDisabled}" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BottomTickBar" Storyboard.TargetProperty="Fill">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTickBarFillDisabled}" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="LeftTickBar" Storyboard.TargetProperty="Fill">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTickBarFillDisabled}" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RightTickBar" Storyboard.TargetProperty="Fill">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTickBarFillDisabled}" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SliderContainer" Storyboard.TargetProperty="Background">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderContainerBackgroundDisabled}" />
-          </ObjectAnimationUsingKeyFrames>
-        </Storyboard>
-      </VisualState>
-
-
-  <VisualStateManager.VisualStateGroups>
-    <VisualStateGroup x:Name="CommonStates">
-      <VisualState x:Name="Normal" />
-
-      <VisualState x:Name="Pressed">
-
-        <Storyboard>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HorizontalTrackRect" Storyboard.TargetProperty="Fill">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTrackFillPressed}" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalTrackRect" Storyboard.TargetProperty="Fill">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTrackFillPressed}" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HorizontalThumb" Storyboard.TargetProperty="Background">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderThumbBackgroundPressed}" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalThumb" Storyboard.TargetProperty="Background">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderThumbBackgroundPressed}" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SliderContainer" Storyboard.TargetProperty="Background">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderContainerBackgroundPressed}" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HorizontalDecreaseRect" Storyboard.TargetProperty="Fill">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTrackValueFillPressed}" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalDecreaseRect" Storyboard.TargetProperty="Fill">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTrackValueFillPressed}" />
-          </ObjectAnimationUsingKeyFrames>
-        </Storyboard>
-      </VisualState>
-
-
-      <VisualState x:Name="PointerOver">
-
-        <Storyboard>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HorizontalTrackRect" Storyboard.TargetProperty="Fill">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTrackFillPointerOver}" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalTrackRect" Storyboard.TargetProperty="Fill">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTrackFillPointerOver}" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HorizontalThumb" Storyboard.TargetProperty="Background">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderThumbBackgroundPointerOver}" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalThumb" Storyboard.TargetProperty="Background">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderThumbBackgroundPointerOver}" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SliderContainer" Storyboard.TargetProperty="Background">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderContainerBackgroundPointerOver}" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HorizontalDecreaseRect" Storyboard.TargetProperty="Fill">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTrackValueFillPointerOver}" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalDecreaseRect" Storyboard.TargetProperty="Fill">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTrackValueFillPointerOver}" />
-          </ObjectAnimationUsingKeyFrames>
-        </Storyboard>
-      </VisualState>
-
-    </VisualStateGroup>
-    <VisualStateGroup x:Name="FocusEngagementStates">
-      <VisualState x:Name="FocusDisengaged" />
-      <VisualState x:Name="FocusEngagedHorizontal">
-
-        <Storyboard>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SliderContainer" Storyboard.TargetProperty="(Control.IsTemplateFocusTarget)">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="False" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HorizontalThumb" Storyboard.TargetProperty="(Control.IsTemplateFocusTarget)">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="True" />
-          </ObjectAnimationUsingKeyFrames>
-        </Storyboard>
-      </VisualState>
-      <VisualState x:Name="FocusEngagedVertical">
-
-        <Storyboard>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SliderContainer" Storyboard.TargetProperty="(Control.IsTemplateFocusTarget)">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="False" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalThumb" Storyboard.TargetProperty="(Control.IsTemplateFocusTarget)">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="True" />
-          </ObjectAnimationUsingKeyFrames>
-        </Storyboard>
-      </VisualState>
-
-    </VisualStateGroup>
-
-  </VisualStateManager.VisualStateGroups>
-
-
-
-  <Style Selector="Slider">
-    <Setter Property="Background" Value="{DynamicResource SliderTrackFill}" />
-    <Setter Property="BorderThickness" Value="{DynamicResource SliderBorderThemeThickness}" />
-    <Setter Property="Foreground" Value="{DynamicResource SliderTrackValueFill}" />
-    <Setter Property="FontFamily" Value="{DynamicResource ContentControlThemeFontFamily}" />
-    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-    <Setter Property="ManipulationMode" Value="None" />
-    <Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
-    <Setter Property="FocusVisualMargin" Value="-7,0,-7,0" />
-    <Setter Property="IsFocusEngagementEnabled" Value="True" />
-    <!-- NOTE: This was a contract7Present:Setter, not sure if this is correct -->
-    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+  <Style Selector="Slider /template/ RepeatButton.repeattrack">
+    <Setter Property="Background" Value="Transparent"/>
+    <Setter Property="Foreground" Value="{DynamicResource ThemeBorderLowBrush}"/>
     <Setter Property="Template">
-      <Setter.Value>
         <ControlTemplate>
-          <Grid Margin="{TemplateBinding Padding}">
-            <Grid.Resources>
-              <Style TargetType="Thumb" x:Key="SliderThumbStyle">
-                <Setter Property="BorderThickness" Value="0" />
-                <Setter Property="Background" Value="{DynamicResource SliderThumbBackground}" />
-                <Setter Property="Template">
-                  <Setter.Value>
-                    <ControlTemplate TargetType="Thumb">
-                      <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{DynamicResource SliderThumbCornerRadius}" />
-                    </ControlTemplate>
-                  </Setter.Value>
-                </Setter>
-              </Style>
-            </Grid.Resources>
-
-            <Grid.RowDefinitions>
-              <RowDefinition Height="Auto" />
-              <RowDefinition Height="*" />
-            </Grid.RowDefinitions>
-
-            <ContentPresenter x:Name="HeaderContentPresenter" Grid.Row="0" Content="{TemplateBinding Header}" ContentTemplate="{TemplateBinding HeaderTemplate}" FontWeight="{DynamicResource SliderHeaderThemeFontWeight}" Foreground="{DynamicResource SliderHeaderForeground}" Margin="{DynamicResource SliderTopHeaderMargin}" TextWrapping="Wrap" Visibility="Collapsed" x:DeferLoadStrategy="Lazy"/>
-            <Grid x:Name="SliderContainer" Grid.Row="1" Background="{DynamicResource SliderContainerBackground}" Control.IsTemplateFocusTarget="True">
-              <Grid x:Name="HorizontalTemplate" MinHeight="{DynamicResource SliderHorizontalHeight}">
-
-                <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
-
-                <Grid.RowDefinitions>
-                  <RowDefinition Height="{DynamicResource SliderPreContentMargin}" />
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="{DynamicResource SliderPostContentMargin}" />
-                </Grid.RowDefinitions>
-
-                <Rectangle x:Name="HorizontalTrackRect" Fill="{TemplateBinding Background}" Height="{DynamicResource SliderTrackThemeHeight}" Grid.Row="1" Grid.ColumnSpan="3" contract7Present:RadiusX="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7Present:RadiusY="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusX="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusY="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" />
-                <Rectangle x:Name="HorizontalDecreaseRect" Fill="{TemplateBinding Foreground}" Grid.Row="1" contract7Present:RadiusX="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7Present:RadiusY="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusX="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusY="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" />
-                <TickBar x:Name="TopTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderTickBarFill}" Height="{DynamicResource SliderOutsideTickBarThemeHeight}" VerticalAlignment="Bottom" Margin="0,0,0,4" Grid.ColumnSpan="3" />
-                <TickBar x:Name="HorizontalInlineTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderInlineTickBarFill}" Height="{DynamicResource SliderTrackThemeHeight}" Grid.Row="1" Grid.ColumnSpan="3" />
-                <TickBar x:Name="BottomTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderTickBarFill}" Height="{DynamicResource SliderOutsideTickBarThemeHeight}" VerticalAlignment="Top" Margin="0,4,0,0" Grid.Row="2" Grid.ColumnSpan="3" />
-                <Thumb x:Name="HorizontalThumb" Style="{StaticResource SliderThumbStyle}" DataContext="{TemplateBinding Value}" Height="{DynamicResource SliderHorizontalThumbHeight}" Width="{DynamicResource SliderHorizontalThumbWidth}" Grid.Row="0" Grid.RowSpan="3" Grid.Column="1" FocusVisualMargin="-14,-6,-14,-6" AutomationProperties.AccessibilityView="Raw" />
-              </Grid>
-              <Grid x:Name="VerticalTemplate" MinWidth="{DynamicResource SliderVerticalWidth}" Visibility="Collapsed">
-
-                <Grid.RowDefinitions>
-                  <RowDefinition Height="*" />
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-                </Grid.RowDefinitions>
-
-                <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="{DynamicResource SliderPreContentMargin}" />
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="{DynamicResource SliderPostContentMargin}" />
-                </Grid.ColumnDefinitions>
-
-                <Rectangle x:Name="VerticalTrackRect" Fill="{TemplateBinding Background}" Width="{DynamicResource SliderTrackThemeHeight}" Grid.Column="1" Grid.RowSpan="3" contract7Present:RadiusX="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7Present:RadiusY="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusX="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusY="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" />
-                <Rectangle x:Name="VerticalDecreaseRect" Fill="{TemplateBinding Foreground}" Grid.Column="1" Grid.Row="2" contract7Present:RadiusX="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7Present:RadiusY="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusX="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusY="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" />
-                <TickBar x:Name="LeftTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderTickBarFill}" Width="{DynamicResource SliderOutsideTickBarThemeHeight}" HorizontalAlignment="Right" Margin="0,0,4,0" Grid.RowSpan="3" />
-                <TickBar x:Name="VerticalInlineTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderInlineTickBarFill}" Width="{DynamicResource SliderTrackThemeHeight}" Grid.Column="1" Grid.RowSpan="3" />
-                <TickBar x:Name="RightTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderTickBarFill}" Width="{DynamicResource SliderOutsideTickBarThemeHeight}" HorizontalAlignment="Left" Margin="4,0,0,0" Grid.Column="2" Grid.RowSpan="3" />
-                <Thumb x:Name="VerticalThumb" Style="{StaticResource SliderThumbStyle}" DataContext="{TemplateBinding Value}" Width="{DynamicResource SliderVerticalThumbWidth}" Height="{DynamicResource SliderVerticalThumbHeight}" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="3" FocusVisualMargin="-6,-14,-6,-14" AutomationProperties.AccessibilityView="Raw" />
-              </Grid>
-
-            </Grid>
-
-          </Grid>
-
+            <Border Background="{TemplateBinding Background}" />
         </ControlTemplate>
-      </Setter.Value>
     </Setter>
   </Style>
-
-</Styles>
-
-
-
-
-
-
-    
+    <Style Selector="Slider:disabled /template/ Grid#grid">
+        <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}" />
+    </Style>
+</Styles>
\ No newline at end of file
diff --git a/src/Avalonia.Themes.Fluent/Slider.xaml b/src/Avalonia.Themes.Fluent/Slider.xaml
index b21cbf3650..f9857be906 100644
--- a/src/Avalonia.Themes.Fluent/Slider.xaml
+++ b/src/Avalonia.Themes.Fluent/Slider.xaml
@@ -1,93 +1,256 @@
-<Styles xmlns="https://github.com/avaloniaui">
-  <Style Selector="Slider:horizontal">
-    <Setter Property="MinWidth" Value="40"/>
-    <Setter Property="MinHeight" Value="20"/>
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Grid Name="grid">
-          <Grid.RowDefinitions>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="Auto" MinHeight="20"/>
-            <RowDefinition Height="Auto"/>
-          </Grid.RowDefinitions>
-          <Border Name="TrackBackground" Grid.Row="1" Height="4" Margin="6,0" VerticalAlignment="Center"/>
-          <Track Name="PART_Track" Grid.Row="1" Orientation="Horizontal">
-            <Track.DecreaseButton>
-               <RepeatButton Name="PART_DecreaseButton"
-                             Classes="repeattrack" />
-            </Track.DecreaseButton>
-            <Track.IncreaseButton>
-               <RepeatButton Name="PART_IncreaseButton"
-                             Classes="repeattrack" />
-            </Track.IncreaseButton>
-            <Thumb Name="thumb" MinWidth="20" MinHeight="20">
-              <Thumb.Template>
-                <ControlTemplate>
-                  <Grid>
-                    <Ellipse Width="12" Height="12" Fill="{DynamicResource ThemeAccentBrush}"/>
-                  </Grid>
-                </ControlTemplate>
-              </Thumb.Template>
-            </Thumb>
-          </Track>
-        </Grid>
-      </ControlTemplate>
-    </Setter>
+<Styles xmlns="https://github.com/avaloniaui" 
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <Styles.Resources>
+    <Thickness x:Key="SliderTopHeaderMargin">0,0,0,4</Thickness>
+    <x:Double x:Key="SliderPreContentMargin">15</x:Double>
+    <x:Double x:Key="SliderPostContentMargin">15</x:Double>
+    <x:Double x:Key="SliderHorizontalHeight">32</x:Double>
+    <x:Double x:Key="SliderVerticalWidth">32</x:Double>
+    <x:Double x:Key="SliderThumbCornerRadius">10</x:Double>
+    <x:Double x:Key="SliderHorizontalThumbWidth">20</x:Double>
+    <x:Double x:Key="SliderHorizontalThumbHeight">20</x:Double>
+    <x:Double x:Key="SliderVerticalThumbWidth">20</x:Double>
+    <x:Double x:Key="SliderVerticalThumbHeight">20</x:Double>
+  </Styles.Resources>
+
+
+  <!-- Disabled State -->
+  <Style Selector="Slider:disabled /template/ ContentPresenter#HeaderContentPresenter">
+    <Setter Property="Foreground" Value="{DynamicResource SliderHeaderForegroundDisabled}" />
   </Style>
-  <Style Selector="Slider:vertical">
-    <Setter Property="MinWidth" Value="20"/>
-    <Setter Property="MinHeight" Value="40"/>
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Grid>
-          <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="Auto"/>
-            <ColumnDefinition Width="Auto" MinWidth="26"/>
-            <ColumnDefinition Width="Auto"/>
-          </Grid.ColumnDefinitions>
-          <Border Name="TrackBackground" Grid.Column="1" Width="4" Margin="0,6" HorizontalAlignment="Center"/>
-          <Track Name="PART_Track" Grid.Column="1" Orientation="Vertical" IsDirectionReversed="True">
-            <Track.DecreaseButton>
-               <RepeatButton Name="PART_DecreaseButton"
-                             Classes="repeattrack" />
-            </Track.DecreaseButton>
-            <Track.IncreaseButton>
-               <RepeatButton Name="PART_IncreaseButton"
-                             Classes="repeattrack" />
-            </Track.IncreaseButton>
-            <Thumb Name="thumb" MinWidth="20" MinHeight="20">
-              <Thumb.Template>
-                <ControlTemplate>
-                  <Grid>
-                    <Ellipse Width="12" Height="12" Fill="{DynamicResource ThemeAccentBrush}"/>
-                  </Grid>
-                </ControlTemplate>
-              </Thumb.Template>
-            </Thumb>
-          </Track>
-        </Grid>
-      </ControlTemplate>
-    </Setter>
+  <Style Selector="Slider:disabled /template/ Rectangle#HorizontalDecreaseRect">
+    <Setter Property="Fill" Value="{DynamicResource SliderTrackValueFillDisabled}" />
+  </Style>
+  <Style Selector="Slider:disabled /template/ Rectangle#HorizontalTrackRect">
+    <Setter Property="Fill" Value="{DynamicResource SliderTrackFillDisabled}" />
+  </Style>
+  <Style Selector="Slider:disabled /template/ Rectangle#VerticalDecreaseRect">
+    <Setter Property="Fill" Value="{DynamicResource SliderTrackValueFillDisabled}" />
+  </Style>
+  <Style Selector="Slider:disabled /template/ Rectangle#VerticalTrackRect">
+    <Setter Property="Fill" Value="{DynamicResource SliderTrackFillDisabled}" />
   </Style>
-  <Style Selector="Slider /template/ Track#PART_Track">
-    <Setter Property="Minimum" Value="{TemplateBinding Minimum}"/>
-    <Setter Property="Maximum" Value="{TemplateBinding Maximum}"/>
-    <Setter Property="Value" Value="{TemplateBinding Value, Mode=TwoWay}"/>
+  <Style Selector="Slider:disabled /template/ Thumb#HorizontalThumb">
+    <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundDisabled}" />
   </Style>
-  <Style Selector="Slider /template/ Border#TrackBackground">
-    <Setter Property="BorderThickness" Value="2"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderLowBrush}"/>
+  <Style Selector="Slider:disabled /template/ Thumb#HorizontalThumb">
+    <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundDisabled}" />
   </Style>
-  <Style Selector="Slider /template/ RepeatButton.repeattrack">
-    <Setter Property="Background" Value="Transparent"/>
-    <Setter Property="Foreground" Value="{DynamicResource ThemeBorderLowBrush}"/>
+
+
+      <VisualState x:Name="Disabled">
+
+        <Storyboard>  
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="" Storyboard.TargetProperty="">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource }" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalThumb" Storyboard.TargetProperty="Background">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource }" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="TopTickBar" Storyboard.TargetProperty="Fill">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTickBarFillDisabled}" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BottomTickBar" Storyboard.TargetProperty="Fill">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTickBarFillDisabled}" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="LeftTickBar" Storyboard.TargetProperty="Fill">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTickBarFillDisabled}" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RightTickBar" Storyboard.TargetProperty="Fill">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTickBarFillDisabled}" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SliderContainer" Storyboard.TargetProperty="Background">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderContainerBackgroundDisabled}" />
+          </ObjectAnimationUsingKeyFrames>
+        </Storyboard>
+      </VisualState>
+
+
+  <VisualStateManager.VisualStateGroups>
+    <VisualStateGroup x:Name="CommonStates">
+      <VisualState x:Name="Normal" />
+
+      <VisualState x:Name="Pressed">
+
+        <Storyboard>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HorizontalTrackRect" Storyboard.TargetProperty="Fill">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTrackFillPressed}" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalTrackRect" Storyboard.TargetProperty="Fill">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTrackFillPressed}" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HorizontalThumb" Storyboard.TargetProperty="Background">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderThumbBackgroundPressed}" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalThumb" Storyboard.TargetProperty="Background">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderThumbBackgroundPressed}" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SliderContainer" Storyboard.TargetProperty="Background">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderContainerBackgroundPressed}" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HorizontalDecreaseRect" Storyboard.TargetProperty="Fill">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTrackValueFillPressed}" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalDecreaseRect" Storyboard.TargetProperty="Fill">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTrackValueFillPressed}" />
+          </ObjectAnimationUsingKeyFrames>
+        </Storyboard>
+      </VisualState>
+
+
+      <VisualState x:Name="PointerOver">
+
+        <Storyboard>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HorizontalTrackRect" Storyboard.TargetProperty="Fill">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTrackFillPointerOver}" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalTrackRect" Storyboard.TargetProperty="Fill">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTrackFillPointerOver}" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HorizontalThumb" Storyboard.TargetProperty="Background">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderThumbBackgroundPointerOver}" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalThumb" Storyboard.TargetProperty="Background">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderThumbBackgroundPointerOver}" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SliderContainer" Storyboard.TargetProperty="Background">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderContainerBackgroundPointerOver}" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HorizontalDecreaseRect" Storyboard.TargetProperty="Fill">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTrackValueFillPointerOver}" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalDecreaseRect" Storyboard.TargetProperty="Fill">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTrackValueFillPointerOver}" />
+          </ObjectAnimationUsingKeyFrames>
+        </Storyboard>
+      </VisualState>
+
+    </VisualStateGroup>
+    <VisualStateGroup x:Name="FocusEngagementStates">
+      <VisualState x:Name="FocusDisengaged" />
+      <VisualState x:Name="FocusEngagedHorizontal">
+
+        <Storyboard>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SliderContainer" Storyboard.TargetProperty="(Control.IsTemplateFocusTarget)">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="False" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HorizontalThumb" Storyboard.TargetProperty="(Control.IsTemplateFocusTarget)">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="True" />
+          </ObjectAnimationUsingKeyFrames>
+        </Storyboard>
+      </VisualState>
+      <VisualState x:Name="FocusEngagedVertical">
+
+        <Storyboard>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SliderContainer" Storyboard.TargetProperty="(Control.IsTemplateFocusTarget)">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="False" />
+          </ObjectAnimationUsingKeyFrames>
+          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalThumb" Storyboard.TargetProperty="(Control.IsTemplateFocusTarget)">
+            <DiscreteObjectKeyFrame KeyTime="0" Value="True" />
+          </ObjectAnimationUsingKeyFrames>
+        </Storyboard>
+      </VisualState>
+
+    </VisualStateGroup>
+
+  </VisualStateManager.VisualStateGroups>
+
+
+
+  <Style Selector="Slider">
+    <Setter Property="Background" Value="{DynamicResource SliderTrackFill}" />
+    <Setter Property="BorderThickness" Value="{DynamicResource SliderBorderThemeThickness}" />
+    <Setter Property="Foreground" Value="{DynamicResource SliderTrackValueFill}" />
+    <Setter Property="FontFamily" Value="{DynamicResource ContentControlThemeFontFamily}" />
+    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+    <Setter Property="ManipulationMode" Value="None" />
+    <Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
+    <Setter Property="FocusVisualMargin" Value="-7,0,-7,0" />
+    <Setter Property="IsFocusEngagementEnabled" Value="True" />
+    <!-- NOTE: This was a contract7Present:Setter, not sure if this is correct -->
+    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
     <Setter Property="Template">
+      <Setter.Value>
         <ControlTemplate>
-            <Border Background="{TemplateBinding Background}" />
+          <Grid Margin="{TemplateBinding Padding}">
+            <Grid.Resources>
+              <Style TargetType="Thumb" x:Key="SliderThumbStyle">
+                <Setter Property="BorderThickness" Value="0" />
+                <Setter Property="Background" Value="{DynamicResource SliderThumbBackground}" />
+                <Setter Property="Template">
+                  <Setter.Value>
+                    <ControlTemplate TargetType="Thumb">
+                      <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{DynamicResource SliderThumbCornerRadius}" />
+                    </ControlTemplate>
+                  </Setter.Value>
+                </Setter>
+              </Style>
+            </Grid.Resources>
+
+            <Grid.RowDefinitions>
+              <RowDefinition Height="Auto" />
+              <RowDefinition Height="*" />
+            </Grid.RowDefinitions>
+
+            <ContentPresenter x:Name="HeaderContentPresenter" Grid.Row="0" Content="{TemplateBinding Header}" ContentTemplate="{TemplateBinding HeaderTemplate}" FontWeight="{DynamicResource SliderHeaderThemeFontWeight}" Foreground="{DynamicResource SliderHeaderForeground}" Margin="{DynamicResource SliderTopHeaderMargin}" TextWrapping="Wrap" Visibility="Collapsed" x:DeferLoadStrategy="Lazy"/>
+            <Grid x:Name="SliderContainer" Grid.Row="1" Background="{DynamicResource SliderContainerBackground}" Control.IsTemplateFocusTarget="True">
+              <Grid x:Name="HorizontalTemplate" MinHeight="{DynamicResource SliderHorizontalHeight}">
+
+                <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="Auto" />
+                  <ColumnDefinition Width="Auto" />
+                  <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
+
+                <Grid.RowDefinitions>
+                  <RowDefinition Height="{DynamicResource SliderPreContentMargin}" />
+                  <RowDefinition Height="Auto" />
+                  <RowDefinition Height="{DynamicResource SliderPostContentMargin}" />
+                </Grid.RowDefinitions>
+
+                <Rectangle x:Name="HorizontalTrackRect" Fill="{TemplateBinding Background}" Height="{DynamicResource SliderTrackThemeHeight}" Grid.Row="1" Grid.ColumnSpan="3" contract7Present:RadiusX="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7Present:RadiusY="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusX="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusY="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" />
+                <Rectangle x:Name="HorizontalDecreaseRect" Fill="{TemplateBinding Foreground}" Grid.Row="1" contract7Present:RadiusX="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7Present:RadiusY="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusX="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusY="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" />
+                <TickBar x:Name="TopTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderTickBarFill}" Height="{DynamicResource SliderOutsideTickBarThemeHeight}" VerticalAlignment="Bottom" Margin="0,0,0,4" Grid.ColumnSpan="3" />
+                <TickBar x:Name="HorizontalInlineTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderInlineTickBarFill}" Height="{DynamicResource SliderTrackThemeHeight}" Grid.Row="1" Grid.ColumnSpan="3" />
+                <TickBar x:Name="BottomTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderTickBarFill}" Height="{DynamicResource SliderOutsideTickBarThemeHeight}" VerticalAlignment="Top" Margin="0,4,0,0" Grid.Row="2" Grid.ColumnSpan="3" />
+                <Thumb x:Name="HorizontalThumb" Style="{StaticResource SliderThumbStyle}" DataContext="{TemplateBinding Value}" Height="{DynamicResource SliderHorizontalThumbHeight}" Width="{DynamicResource SliderHorizontalThumbWidth}" Grid.Row="0" Grid.RowSpan="3" Grid.Column="1" FocusVisualMargin="-14,-6,-14,-6" AutomationProperties.AccessibilityView="Raw" />
+              </Grid>
+              <Grid x:Name="VerticalTemplate" MinWidth="{DynamicResource SliderVerticalWidth}" Visibility="Collapsed">
+
+                <Grid.RowDefinitions>
+                  <RowDefinition Height="*" />
+                  <RowDefinition Height="Auto" />
+                  <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+
+                <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="{DynamicResource SliderPreContentMargin}" />
+                  <ColumnDefinition Width="Auto" />
+                  <ColumnDefinition Width="{DynamicResource SliderPostContentMargin}" />
+                </Grid.ColumnDefinitions>
+
+                <Rectangle x:Name="VerticalTrackRect" Fill="{TemplateBinding Background}" Width="{DynamicResource SliderTrackThemeHeight}" Grid.Column="1" Grid.RowSpan="3" contract7Present:RadiusX="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7Present:RadiusY="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusX="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusY="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" />
+                <Rectangle x:Name="VerticalDecreaseRect" Fill="{TemplateBinding Foreground}" Grid.Column="1" Grid.Row="2" contract7Present:RadiusX="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7Present:RadiusY="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusX="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusY="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" />
+                <TickBar x:Name="LeftTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderTickBarFill}" Width="{DynamicResource SliderOutsideTickBarThemeHeight}" HorizontalAlignment="Right" Margin="0,0,4,0" Grid.RowSpan="3" />
+                <TickBar x:Name="VerticalInlineTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderInlineTickBarFill}" Width="{DynamicResource SliderTrackThemeHeight}" Grid.Column="1" Grid.RowSpan="3" />
+                <TickBar x:Name="RightTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderTickBarFill}" Width="{DynamicResource SliderOutsideTickBarThemeHeight}" HorizontalAlignment="Left" Margin="4,0,0,0" Grid.Column="2" Grid.RowSpan="3" />
+                <Thumb x:Name="VerticalThumb" Style="{StaticResource SliderThumbStyle}" DataContext="{TemplateBinding Value}" Width="{DynamicResource SliderVerticalThumbWidth}" Height="{DynamicResource SliderVerticalThumbHeight}" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="3" FocusVisualMargin="-6,-14,-6,-14" AutomationProperties.AccessibilityView="Raw" />
+              </Grid>
+
+            </Grid>
+
+          </Grid>
+
         </ControlTemplate>
+      </Setter.Value>
     </Setter>
   </Style>
-    <Style Selector="Slider:disabled /template/ Grid#grid">
-        <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}" />
-    </Style>
+
 </Styles>
+
+
+
+
+
+
+    

From 4c7bcc09cfa542d974230d7e45bcc6bdca74ee62 Mon Sep 17 00:00:00 2001
From: Jumar Macato <hikari.netto23@gmail.com>
Date: Thu, 28 May 2020 14:21:04 +0800
Subject: [PATCH 18/45] port visual states

---
 src/Avalonia.Themes.Fluent/Slider.xaml | 266 +++++++++++--------------
 1 file changed, 116 insertions(+), 150 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Slider.xaml b/src/Avalonia.Themes.Fluent/Slider.xaml
index f9857be906..014095b924 100644
--- a/src/Avalonia.Themes.Fluent/Slider.xaml
+++ b/src/Avalonia.Themes.Fluent/Slider.xaml
@@ -1,5 +1,4 @@
-<Styles xmlns="https://github.com/avaloniaui" 
-  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <Styles.Resources>
     <Thickness x:Key="SliderTopHeaderMargin">0,0,0,4</Thickness>
     <x:Double x:Key="SliderPreContentMargin">15</x:Double>
@@ -12,8 +11,7 @@
     <x:Double x:Key="SliderVerticalThumbWidth">20</x:Double>
     <x:Double x:Key="SliderVerticalThumbHeight">20</x:Double>
   </Styles.Resources>
-
-
+  
   <!-- Disabled State -->
   <Style Selector="Slider:disabled /template/ ContentPresenter#HeaderContentPresenter">
     <Setter Property="Foreground" Value="{DynamicResource SliderHeaderForegroundDisabled}" />
@@ -33,129 +31,96 @@
   <Style Selector="Slider:disabled /template/ Thumb#HorizontalThumb">
     <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundDisabled}" />
   </Style>
-  <Style Selector="Slider:disabled /template/ Thumb#HorizontalThumb">
+  <Style Selector="Slider:disabled /template/ Thumb#VerticalThumb">
     <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundDisabled}" />
   </Style>
+  <Style Selector="Slider:disabled /template/ TickBar#TopTickBar">
+    <Setter Property="Background" Value="{DynamicResource SliderTickBarFillDisabled}" />
+  </Style>
+  <Style Selector="Slider:disabled /template/ TickBar#BottomTickBar">
+    <Setter Property="Background" Value="{DynamicResource SliderTickBarFillDisabled}" />
+  </Style>
+  <Style Selector="Slider:disabled /template/ TickBar#LeftTickBar">
+    <Setter Property="Background" Value="{DynamicResource SliderTickBarFillDisabled}" />
+  </Style>
+  <Style Selector="Slider:disabled /template/ TickBar#RightTickBar">
+    <Setter Property="Background" Value="{DynamicResource SliderTickBarFillDisabled}" />
+  </Style>
+  <Style Selector="Slider:disabled /template/ Grid#SliderContainer">
+    <Setter Property="Background" Value="{DynamicResource SliderContainerBackgroundDisabled}" />
+  </Style>
+  
+  <!-- Pressed State -->
+  <Style Selector="Slider:pressed /template/ Rectangle#HorizontalTrackRect">
+    <Setter Property="Fill" Value="{DynamicResource SliderTrackFillPressed}" />
+  </Style>
+  <Style Selector="Slider:pressed /template/ Rectangle#HorizontalTrackRect">
+    <Setter Property="Fill" Value="{DynamicResource SliderTrackFillPressed}" />
+  </Style>
+  <Style Selector="Slider:pressed /template/ Rectangle#VerticalTrackRect">
+    <Setter Property="Background" Value="{DynamicResource SliderTrackFillPressed}" />
+  </Style>
+  <Style Selector="Slider:pressed /template/ Thumb#HorizontalThumb">
+    <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundPressed}" />
+  </Style>
+  <Style Selector="Slider:pressed /template/ Thumb#VerticalThumb">
+    <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundPressed}" />
+  </Style>
+  <Style Selector="Slider:pressed /template/ Grid#SliderContainer">
+    <Setter Property="Background" Value="{DynamicResource SliderContainerBackgroundPressed}" />
+  </Style>
+  <Style Selector="Slider:pressed /template/ Rectangle#HorizontalDecreaseRect">
+    <Setter Property="Fill" Value="{DynamicResource SliderTrackValueFillPressed}" />
+  </Style>
+  <Style Selector="Slider:pressed /template/ Rectangle#VerticalDecreaseRect">
+    <Setter Property="Fill" Value="{DynamicResource SliderTrackValueFillPressed}" />
+  </Style>
 
+  <!-- PointerOver State -->
+  <Style Selector="Slider:pointerover /template/ Rectangle#HorizontalTrackRect">
+    <Setter Property="Fill" Value="{DynamicResource SliderTrackFillPointerOver}" />
+  </Style>
+  <Style Selector="Slider:pointerover /template/ Rectangle#VerticalTrackRect">
+    <Setter Property="Fill" Value="{DynamicResource SliderTrackFillPointerOver}" />
+  </Style>
+  <Style Selector="Slider:pointerover /template/ Thumb#HorizontalThumb">
+    <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundPointerOver}" />
+  </Style>
+  <Style Selector="Slider:pointerover /template/ Thumb#VerticalThumb">
+    <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundPointerOver}" />
+  </Style>
+  <Style Selector="Slider:pointerover /template/ Grid#SliderContainer">
+    <Setter Property="Background" Value="{DynamicResource SliderContainerBackgroundPointerOver}" />
+  </Style>
+  <Style Selector="Slider:pointerover /template/ Rectangle#HorizontalDecreaseRect">
+    <Setter Property="Fill" Value="{DynamicResource SliderTrackValueFillPointerOver}" />
+  </Style>
+  <Style Selector="Slider:pointerover /template/ Rectangle#VerticalDecreaseRect">
+    <Setter Property="Fill" Value="{DynamicResource SliderTrackValueFillPointerOver}" />
+  </Style>
 
-      <VisualState x:Name="Disabled">
-
-        <Storyboard>  
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="" Storyboard.TargetProperty="">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource }" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalThumb" Storyboard.TargetProperty="Background">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource }" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="TopTickBar" Storyboard.TargetProperty="Fill">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTickBarFillDisabled}" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BottomTickBar" Storyboard.TargetProperty="Fill">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTickBarFillDisabled}" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="LeftTickBar" Storyboard.TargetProperty="Fill">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTickBarFillDisabled}" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RightTickBar" Storyboard.TargetProperty="Fill">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTickBarFillDisabled}" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SliderContainer" Storyboard.TargetProperty="Background">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderContainerBackgroundDisabled}" />
-          </ObjectAnimationUsingKeyFrames>
-        </Storyboard>
-      </VisualState>
-
-
-  <VisualStateManager.VisualStateGroups>
-    <VisualStateGroup x:Name="CommonStates">
-      <VisualState x:Name="Normal" />
-
-      <VisualState x:Name="Pressed">
-
-        <Storyboard>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HorizontalTrackRect" Storyboard.TargetProperty="Fill">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTrackFillPressed}" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalTrackRect" Storyboard.TargetProperty="Fill">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTrackFillPressed}" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HorizontalThumb" Storyboard.TargetProperty="Background">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderThumbBackgroundPressed}" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalThumb" Storyboard.TargetProperty="Background">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderThumbBackgroundPressed}" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SliderContainer" Storyboard.TargetProperty="Background">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderContainerBackgroundPressed}" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HorizontalDecreaseRect" Storyboard.TargetProperty="Fill">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTrackValueFillPressed}" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalDecreaseRect" Storyboard.TargetProperty="Fill">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTrackValueFillPressed}" />
-          </ObjectAnimationUsingKeyFrames>
-        </Storyboard>
-      </VisualState>
-
-
-      <VisualState x:Name="PointerOver">
-
-        <Storyboard>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HorizontalTrackRect" Storyboard.TargetProperty="Fill">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTrackFillPointerOver}" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalTrackRect" Storyboard.TargetProperty="Fill">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTrackFillPointerOver}" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HorizontalThumb" Storyboard.TargetProperty="Background">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderThumbBackgroundPointerOver}" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalThumb" Storyboard.TargetProperty="Background">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderThumbBackgroundPointerOver}" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SliderContainer" Storyboard.TargetProperty="Background">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderContainerBackgroundPointerOver}" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HorizontalDecreaseRect" Storyboard.TargetProperty="Fill">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTrackValueFillPointerOver}" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalDecreaseRect" Storyboard.TargetProperty="Fill">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="{DynamicResource SliderTrackValueFillPointerOver}" />
-          </ObjectAnimationUsingKeyFrames>
-        </Storyboard>
-      </VisualState>
-
-    </VisualStateGroup>
-    <VisualStateGroup x:Name="FocusEngagementStates">
-      <VisualState x:Name="FocusDisengaged" />
-      <VisualState x:Name="FocusEngagedHorizontal">
-
-        <Storyboard>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SliderContainer" Storyboard.TargetProperty="(Control.IsTemplateFocusTarget)">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="False" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HorizontalThumb" Storyboard.TargetProperty="(Control.IsTemplateFocusTarget)">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="True" />
-          </ObjectAnimationUsingKeyFrames>
-        </Storyboard>
-      </VisualState>
-      <VisualState x:Name="FocusEngagedVertical">
-
-        <Storyboard>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SliderContainer" Storyboard.TargetProperty="(Control.IsTemplateFocusTarget)">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="False" />
-          </ObjectAnimationUsingKeyFrames>
-          <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalThumb" Storyboard.TargetProperty="(Control.IsTemplateFocusTarget)">
-            <DiscreteObjectKeyFrame KeyTime="0" Value="True" />
-          </ObjectAnimationUsingKeyFrames>
-        </Storyboard>
-      </VisualState>
-
-    </VisualStateGroup>
-
-  </VisualStateManager.VisualStateGroups>
-
-
+  <!-- TODO: We don't have an equivalent for this afaik. -->
+  <!-- <VisualState x:Name="FocusDisengaged" />
+  <VisualState x:Name="FocusEngagedHorizontal">
+    <Storyboard>
+      <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SliderContainer" Storyboard.TargetProperty="(Control.IsTemplateFocusTarget)">
+        <DiscreteObjectKeyFrame KeyTime="0" Value="False" />
+      </ObjectAnimationUsingKeyFrames>
+      <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HorizontalThumb" Storyboard.TargetProperty="(Control.IsTemplateFocusTarget)">
+        <DiscreteObjectKeyFrame KeyTime="0" Value="True" />
+      </ObjectAnimationUsingKeyFrames>
+    </Storyboard>
+  </VisualState>
+  <VisualState x:Name="FocusEngagedVertical">
+    <Storyboard>
+      <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SliderContainer" Storyboard.TargetProperty="(Control.IsTemplateFocusTarget)">
+        <DiscreteObjectKeyFrame KeyTime="0" Value="False" />
+      </ObjectAnimationUsingKeyFrames>
+      <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalThumb" Storyboard.TargetProperty="(Control.IsTemplateFocusTarget)">
+        <DiscreteObjectKeyFrame KeyTime="0" Value="True" />
+      </ObjectAnimationUsingKeyFrames>
+    </Storyboard>
+     -->
 
   <Style Selector="Slider">
     <Setter Property="Background" Value="{DynamicResource SliderTrackFill}" />
@@ -186,71 +151,72 @@
                 </Setter>
               </Style>
             </Grid.Resources>
-
             <Grid.RowDefinitions>
               <RowDefinition Height="Auto" />
               <RowDefinition Height="*" />
             </Grid.RowDefinitions>
-
-            <ContentPresenter x:Name="HeaderContentPresenter" Grid.Row="0" Content="{TemplateBinding Header}" ContentTemplate="{TemplateBinding HeaderTemplate}" FontWeight="{DynamicResource SliderHeaderThemeFontWeight}" Foreground="{DynamicResource SliderHeaderForeground}" Margin="{DynamicResource SliderTopHeaderMargin}" TextWrapping="Wrap" Visibility="Collapsed" x:DeferLoadStrategy="Lazy"/>
+            <ContentPresenter x:Name="HeaderContentPresenter" Grid.Row="0" Content="{TemplateBinding Header}" ContentTemplate="{TemplateBinding HeaderTemplate}" FontWeight="{DynamicResource SliderHeaderThemeFontWeight}"
+            Foreground="{DynamicResource SliderHeaderForeground}" Margin="{DynamicResource SliderTopHeaderMargin}" TextWrapping="Wrap" Visibility="Collapsed" x:DeferLoadStrategy="Lazy" />
             <Grid x:Name="SliderContainer" Grid.Row="1" Background="{DynamicResource SliderContainerBackground}" Control.IsTemplateFocusTarget="True">
               <Grid x:Name="HorizontalTemplate" MinHeight="{DynamicResource SliderHorizontalHeight}">
-
                 <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="Auto" />
                   <ColumnDefinition Width="Auto" />
                   <ColumnDefinition Width="*" />
                 </Grid.ColumnDefinitions>
-
                 <Grid.RowDefinitions>
                   <RowDefinition Height="{DynamicResource SliderPreContentMargin}" />
                   <RowDefinition Height="Auto" />
                   <RowDefinition Height="{DynamicResource SliderPostContentMargin}" />
                 </Grid.RowDefinitions>
-
-                <Rectangle x:Name="HorizontalTrackRect" Fill="{TemplateBinding Background}" Height="{DynamicResource SliderTrackThemeHeight}" Grid.Row="1" Grid.ColumnSpan="3" contract7Present:RadiusX="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7Present:RadiusY="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusX="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusY="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" />
-                <Rectangle x:Name="HorizontalDecreaseRect" Fill="{TemplateBinding Foreground}" Grid.Row="1" contract7Present:RadiusX="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7Present:RadiusY="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusX="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusY="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" />
+                <Rectangle x:Name="HorizontalTrackRect" Fill="{TemplateBinding Background}" Height="{DynamicResource SliderTrackThemeHeight}" Grid.Row="1" Grid.ColumnSpan="3"
+                contract7Present:RadiusX="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}"
+                contract7Present:RadiusY="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}"
+                contract7NotPresent:RadiusX="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}"
+                contract7NotPresent:RadiusY="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" />
+                <Rectangle x:Name="HorizontalDecreaseRect" Fill="{TemplateBinding Foreground}" Grid.Row="1"
+                contract7Present:RadiusX="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}"
+                contract7Present:RadiusY="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}"
+                contract7NotPresent:RadiusX="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}"
+                contract7NotPresent:RadiusY="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" />
                 <TickBar x:Name="TopTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderTickBarFill}" Height="{DynamicResource SliderOutsideTickBarThemeHeight}" VerticalAlignment="Bottom" Margin="0,0,0,4" Grid.ColumnSpan="3" />
                 <TickBar x:Name="HorizontalInlineTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderInlineTickBarFill}" Height="{DynamicResource SliderTrackThemeHeight}" Grid.Row="1" Grid.ColumnSpan="3" />
                 <TickBar x:Name="BottomTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderTickBarFill}" Height="{DynamicResource SliderOutsideTickBarThemeHeight}" VerticalAlignment="Top" Margin="0,4,0,0" Grid.Row="2" Grid.ColumnSpan="3" />
-                <Thumb x:Name="HorizontalThumb" Style="{StaticResource SliderThumbStyle}" DataContext="{TemplateBinding Value}" Height="{DynamicResource SliderHorizontalThumbHeight}" Width="{DynamicResource SliderHorizontalThumbWidth}" Grid.Row="0" Grid.RowSpan="3" Grid.Column="1" FocusVisualMargin="-14,-6,-14,-6" AutomationProperties.AccessibilityView="Raw" />
+                <Thumb x:Name="HorizontalThumb" Style="{StaticResource SliderThumbStyle}" DataContext="{TemplateBinding Value}" Height="{DynamicResource SliderHorizontalThumbHeight}" Width="{DynamicResource SliderHorizontalThumbWidth}" Grid.Row="0"
+                Grid.RowSpan="3" Grid.Column="1" FocusVisualMargin="-14,-6,-14,-6" AutomationProperties.AccessibilityView="Raw" />
               </Grid>
               <Grid x:Name="VerticalTemplate" MinWidth="{DynamicResource SliderVerticalWidth}" Visibility="Collapsed">
-
                 <Grid.RowDefinitions>
                   <RowDefinition Height="*" />
                   <RowDefinition Height="Auto" />
                   <RowDefinition Height="Auto" />
                 </Grid.RowDefinitions>
-
                 <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="{DynamicResource SliderPreContentMargin}" />
                   <ColumnDefinition Width="Auto" />
                   <ColumnDefinition Width="{DynamicResource SliderPostContentMargin}" />
                 </Grid.ColumnDefinitions>
-
-                <Rectangle x:Name="VerticalTrackRect" Fill="{TemplateBinding Background}" Width="{DynamicResource SliderTrackThemeHeight}" Grid.Column="1" Grid.RowSpan="3" contract7Present:RadiusX="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7Present:RadiusY="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusX="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusY="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" />
-                <Rectangle x:Name="VerticalDecreaseRect" Fill="{TemplateBinding Foreground}" Grid.Column="1" Grid.Row="2" contract7Present:RadiusX="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7Present:RadiusY="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusX="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusY="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" />
+                <Rectangle x:Name="VerticalTrackRect" Fill="{TemplateBinding Background}" Width="{DynamicResource SliderTrackThemeHeight}" Grid.Column="1" Grid.RowSpan="3"
+                contract7Present:RadiusX="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}"
+                contract7Present:RadiusY="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}"
+                contract7NotPresent:RadiusX="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}"
+                contract7NotPresent:RadiusY="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" />
+                <Rectangle x:Name="VerticalDecreaseRect" Fill="{TemplateBinding Foreground}" Grid.Column="1" Grid.Row="2"
+                contract7Present:RadiusX="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}"
+                contract7Present:RadiusY="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}"
+                contract7NotPresent:RadiusX="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}"
+                contract7NotPresent:RadiusY="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" />
                 <TickBar x:Name="LeftTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderTickBarFill}" Width="{DynamicResource SliderOutsideTickBarThemeHeight}" HorizontalAlignment="Right" Margin="0,0,4,0" Grid.RowSpan="3" />
                 <TickBar x:Name="VerticalInlineTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderInlineTickBarFill}" Width="{DynamicResource SliderTrackThemeHeight}" Grid.Column="1" Grid.RowSpan="3" />
-                <TickBar x:Name="RightTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderTickBarFill}" Width="{DynamicResource SliderOutsideTickBarThemeHeight}" HorizontalAlignment="Left" Margin="4,0,0,0" Grid.Column="2" Grid.RowSpan="3" />
-                <Thumb x:Name="VerticalThumb" Style="{StaticResource SliderThumbStyle}" DataContext="{TemplateBinding Value}" Width="{DynamicResource SliderVerticalThumbWidth}" Height="{DynamicResource SliderVerticalThumbHeight}" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="3" FocusVisualMargin="-6,-14,-6,-14" AutomationProperties.AccessibilityView="Raw" />
+                <TickBar x:Name="RightTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderTickBarFill}" Width="{DynamicResource SliderOutsideTickBarThemeHeight}" HorizontalAlignment="Left" Margin="4,0,0,0" Grid.Column="2"
+                Grid.RowSpan="3" />
+                <Thumb x:Name="VerticalThumb" Style="{StaticResource SliderThumbStyle}" DataContext="{TemplateBinding Value}" Width="{DynamicResource SliderVerticalThumbWidth}" Height="{DynamicResource SliderVerticalThumbHeight}" Grid.Row="1"
+                Grid.Column="0" Grid.ColumnSpan="3" FocusVisualMargin="-6,-14,-6,-14" AutomationProperties.AccessibilityView="Raw" />
               </Grid>
-
             </Grid>
-
           </Grid>
-
         </ControlTemplate>
       </Setter.Value>
     </Setter>
   </Style>
-
 </Styles>
-
-
-
-
-
-
-    

From c577f6a5bdc613662ee5909b689921ebcb774129 Mon Sep 17 00:00:00 2001
From: Jumar Macato <hikari.netto23@gmail.com>
Date: Thu, 28 May 2020 15:13:32 +0800
Subject: [PATCH 19/45] try making slider work

---
 src/Avalonia.Controls/Slider.cs               |  15 +-
 src/Avalonia.Themes.Fluent/Slider.xaml        | 207 +++++++++---------
 src/Avalonia.Visuals/Media/Color.cs           |   2 +
 .../Media/ColorToSolidColorBrushConverter.cs  |  36 +++
 4 files changed, 148 insertions(+), 112 deletions(-)
 create mode 100644 src/Avalonia.Visuals/Media/ColorToSolidColorBrushConverter.cs

diff --git a/src/Avalonia.Controls/Slider.cs b/src/Avalonia.Controls/Slider.cs
index e92c8faf20..9faf77d445 100644
--- a/src/Avalonia.Controls/Slider.cs
+++ b/src/Avalonia.Controls/Slider.cs
@@ -94,9 +94,18 @@ namespace Avalonia.Controls
                 _increaseButton.Click -= IncreaseClick;
             }
 
-            _decreaseButton = e.NameScope.Find<Button>("PART_DecreaseButton");
-            _track = e.NameScope.Find<Track>("PART_Track");
-            _increaseButton = e.NameScope.Find<Button>("PART_IncreaseButton");
+            // _decreaseButton = e.NameScope.Find<Button>("PART_DecreaseButton");
+
+            if (Orientation == Orientation.Horizontal)
+            {
+                _track = e.NameScope.Find<Track>("HorizontalThumb");
+            }
+            else
+            {
+                _track = e.NameScope.Find<Track>("VerticalThumb");
+            }
+
+            // _increaseButton = e.NameScope.Find<Button>("PART_IncreaseButton");
 
             if (_decreaseButton != null)
             {
diff --git a/src/Avalonia.Themes.Fluent/Slider.xaml b/src/Avalonia.Themes.Fluent/Slider.xaml
index 014095b924..523619fc5f 100644
--- a/src/Avalonia.Themes.Fluent/Slider.xaml
+++ b/src/Avalonia.Themes.Fluent/Slider.xaml
@@ -5,28 +5,27 @@
     <x:Double x:Key="SliderPostContentMargin">15</x:Double>
     <x:Double x:Key="SliderHorizontalHeight">32</x:Double>
     <x:Double x:Key="SliderVerticalWidth">32</x:Double>
-    <x:Double x:Key="SliderThumbCornerRadius">10</x:Double>
+    <Thickness x:Key="SliderThumbCornerRadius">10</Thickness>
     <x:Double x:Key="SliderHorizontalThumbWidth">20</x:Double>
     <x:Double x:Key="SliderHorizontalThumbHeight">20</x:Double>
     <x:Double x:Key="SliderVerticalThumbWidth">20</x:Double>
     <x:Double x:Key="SliderVerticalThumbHeight">20</x:Double>
   </Styles.Resources>
-  
   <!-- Disabled State -->
-  <Style Selector="Slider:disabled /template/ ContentPresenter#HeaderContentPresenter">
+  <!-- <Style Selector="Slider:disabled /template/ ContentPresenter#HeaderContentPresenter">
     <Setter Property="Foreground" Value="{DynamicResource SliderHeaderForegroundDisabled}" />
+  </Style> -->
+  <Style Selector="Slider:disabled /template/ Border#HorizontalDecreaseRect">
+    <Setter Property="Background" Value="{DynamicResource SliderTrackValueFillDisabled}" />
   </Style>
-  <Style Selector="Slider:disabled /template/ Rectangle#HorizontalDecreaseRect">
-    <Setter Property="Fill" Value="{DynamicResource SliderTrackValueFillDisabled}" />
+  <Style Selector="Slider:disabled /template/ Border#HorizontalTrackRect">
+    <Setter Property="Background" Value="{DynamicResource SliderTrackFillDisabled}" />
   </Style>
-  <Style Selector="Slider:disabled /template/ Rectangle#HorizontalTrackRect">
-    <Setter Property="Fill" Value="{DynamicResource SliderTrackFillDisabled}" />
+  <Style Selector="Slider:disabled /template/ Border#VerticalDecreaseRect">
+    <Setter Property="Background" Value="{DynamicResource SliderTrackValueFillDisabled}" />
   </Style>
-  <Style Selector="Slider:disabled /template/ Rectangle#VerticalDecreaseRect">
-    <Setter Property="Fill" Value="{DynamicResource SliderTrackValueFillDisabled}" />
-  </Style>
-  <Style Selector="Slider:disabled /template/ Rectangle#VerticalTrackRect">
-    <Setter Property="Fill" Value="{DynamicResource SliderTrackFillDisabled}" />
+  <Style Selector="Slider:disabled /template/ Border#VerticalTrackRect">
+    <Setter Property="Background" Value="{DynamicResource SliderTrackFillDisabled}" />
   </Style>
   <Style Selector="Slider:disabled /template/ Thumb#HorizontalThumb">
     <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundDisabled}" />
@@ -34,7 +33,7 @@
   <Style Selector="Slider:disabled /template/ Thumb#VerticalThumb">
     <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundDisabled}" />
   </Style>
-  <Style Selector="Slider:disabled /template/ TickBar#TopTickBar">
+  <!-- <Style Selector="Slider:disabled /template/ TickBar#TopTickBar">
     <Setter Property="Background" Value="{DynamicResource SliderTickBarFillDisabled}" />
   </Style>
   <Style Selector="Slider:disabled /template/ TickBar#BottomTickBar">
@@ -45,19 +44,18 @@
   </Style>
   <Style Selector="Slider:disabled /template/ TickBar#RightTickBar">
     <Setter Property="Background" Value="{DynamicResource SliderTickBarFillDisabled}" />
-  </Style>
+  </Style> -->
   <Style Selector="Slider:disabled /template/ Grid#SliderContainer">
     <Setter Property="Background" Value="{DynamicResource SliderContainerBackgroundDisabled}" />
   </Style>
-  
   <!-- Pressed State -->
-  <Style Selector="Slider:pressed /template/ Rectangle#HorizontalTrackRect">
-    <Setter Property="Fill" Value="{DynamicResource SliderTrackFillPressed}" />
+  <Style Selector="Slider:pressed /template/ Border#HorizontalTrackRect">
+    <Setter Property="Background" Value="{DynamicResource SliderTrackFillPressed}" />
   </Style>
-  <Style Selector="Slider:pressed /template/ Rectangle#HorizontalTrackRect">
-    <Setter Property="Fill" Value="{DynamicResource SliderTrackFillPressed}" />
+  <Style Selector="Slider:pressed /template/ Border#HorizontalTrackRect">
+    <Setter Property="Background" Value="{DynamicResource SliderTrackFillPressed}" />
   </Style>
-  <Style Selector="Slider:pressed /template/ Rectangle#VerticalTrackRect">
+  <Style Selector="Slider:pressed /template/ Border#VerticalTrackRect">
     <Setter Property="Background" Value="{DynamicResource SliderTrackFillPressed}" />
   </Style>
   <Style Selector="Slider:pressed /template/ Thumb#HorizontalThumb">
@@ -69,19 +67,18 @@
   <Style Selector="Slider:pressed /template/ Grid#SliderContainer">
     <Setter Property="Background" Value="{DynamicResource SliderContainerBackgroundPressed}" />
   </Style>
-  <Style Selector="Slider:pressed /template/ Rectangle#HorizontalDecreaseRect">
-    <Setter Property="Fill" Value="{DynamicResource SliderTrackValueFillPressed}" />
+  <Style Selector="Slider:pressed /template/ Border#HorizontalDecreaseRect">
+    <Setter Property="Background" Value="{DynamicResource SliderTrackValueFillPressed}" />
   </Style>
-  <Style Selector="Slider:pressed /template/ Rectangle#VerticalDecreaseRect">
-    <Setter Property="Fill" Value="{DynamicResource SliderTrackValueFillPressed}" />
+  <Style Selector="Slider:pressed /template/ Border#VerticalDecreaseRect">
+    <Setter Property="Background" Value="{DynamicResource SliderTrackValueFillPressed}" />
   </Style>
-
   <!-- PointerOver State -->
-  <Style Selector="Slider:pointerover /template/ Rectangle#HorizontalTrackRect">
-    <Setter Property="Fill" Value="{DynamicResource SliderTrackFillPointerOver}" />
+  <Style Selector="Slider:pointerover /template/ Border#HorizontalTrackRect">
+    <Setter Property="Background" Value="{DynamicResource SliderTrackFillPointerOver}" />
   </Style>
-  <Style Selector="Slider:pointerover /template/ Rectangle#VerticalTrackRect">
-    <Setter Property="Fill" Value="{DynamicResource SliderTrackFillPointerOver}" />
+  <Style Selector="Slider:pointerover /template/ Border#VerticalTrackRect">
+    <Setter Property="Background" Value="{DynamicResource SliderTrackFillPointerOver}" />
   </Style>
   <Style Selector="Slider:pointerover /template/ Thumb#HorizontalThumb">
     <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundPointerOver}" />
@@ -92,16 +89,15 @@
   <Style Selector="Slider:pointerover /template/ Grid#SliderContainer">
     <Setter Property="Background" Value="{DynamicResource SliderContainerBackgroundPointerOver}" />
   </Style>
-  <Style Selector="Slider:pointerover /template/ Rectangle#HorizontalDecreaseRect">
-    <Setter Property="Fill" Value="{DynamicResource SliderTrackValueFillPointerOver}" />
+  <Style Selector="Slider:pointerover /template/ Border#HorizontalDecreaseRect">
+    <Setter Property="Background" Value="{DynamicResource SliderTrackValueFillPointerOver}" />
   </Style>
-  <Style Selector="Slider:pointerover /template/ Rectangle#VerticalDecreaseRect">
-    <Setter Property="Fill" Value="{DynamicResource SliderTrackValueFillPointerOver}" />
+  <Style Selector="Slider:pointerover /template/ Border#VerticalDecreaseRect">
+    <Setter Property="Background" Value="{DynamicResource SliderTrackValueFillPointerOver}" />
   </Style>
-
   <!-- TODO: We don't have an equivalent for this afaik. -->
-  <!-- <VisualState x:Name="FocusDisengaged" />
-  <VisualState x:Name="FocusEngagedHorizontal">
+  <!-- <VisualState Name="FocusDisengaged" />
+  <VisualState Name="FocusEngagedHorizontal">
     <Storyboard>
       <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SliderContainer" Storyboard.TargetProperty="(Control.IsTemplateFocusTarget)">
         <DiscreteObjectKeyFrame KeyTime="0" Value="False" />
@@ -111,7 +107,7 @@
       </ObjectAnimationUsingKeyFrames>
     </Storyboard>
   </VisualState>
-  <VisualState x:Name="FocusEngagedVertical">
+  <VisualState Name="FocusEngagedVertical">
     <Storyboard>
       <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SliderContainer" Storyboard.TargetProperty="(Control.IsTemplateFocusTarget)">
         <DiscreteObjectKeyFrame KeyTime="0" Value="False" />
@@ -120,7 +116,20 @@
         <DiscreteObjectKeyFrame KeyTime="0" Value="True" />
       </ObjectAnimationUsingKeyFrames>
     </Storyboard>
-     -->
+     --> 
+    
+  <Style Selector="Slider:vertical /template/ Grid#VerticalTemplate">
+    <Setter Property="IsVisible" Value="True" />
+  </Style>
+  <Style Selector="Slider:vertical /template/ Grid#HorizontalTemplate">
+    <Setter Property="IsVisible" Value="False" />
+  </Style>
+  <Style Selector="Slider:horizontal /template/ Grid#HorizontalTemplate">
+    <Setter Property="IsVisible" Value="True" />
+  </Style>
+  <Style Selector="Slider:horizontal /template/ Grid#VerticalTemplate">
+    <Setter Property="IsVisible" Value="False" />
+  </Style>
 
   <Style Selector="Slider">
     <Setter Property="Background" Value="{DynamicResource SliderTrackFill}" />
@@ -128,93 +137,73 @@
     <Setter Property="Foreground" Value="{DynamicResource SliderTrackValueFill}" />
     <Setter Property="FontFamily" Value="{DynamicResource ContentControlThemeFontFamily}" />
     <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-    <Setter Property="ManipulationMode" Value="None" />
+    <!-- TODO Non-existent properties in avalonia. -->
+    <!-- <Setter Property="ManipulationMode" Value="None" />
     <Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
     <Setter Property="FocusVisualMargin" Value="-7,0,-7,0" />
-    <Setter Property="IsFocusEngagementEnabled" Value="True" />
-    <!-- NOTE: This was a contract7Present:Setter, not sure if this is correct -->
-    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+    <Setter Property="IsFocusEngagementEnabled" Value="True" /> -->
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate>
-          <Grid Margin="{TemplateBinding Padding}">
-            <Grid.Resources>
-              <Style TargetType="Thumb" x:Key="SliderThumbStyle">
+          <Border Margin="{TemplateBinding Padding}" CornerRadius="{DynamicResource ControlCornerRadius}">
+            <Border.Styles>
+              <Style Selector="Thumb.SliderThumbStyle">
                 <Setter Property="BorderThickness" Value="0" />
                 <Setter Property="Background" Value="{DynamicResource SliderThumbBackground}" />
                 <Setter Property="Template">
                   <Setter.Value>
-                    <ControlTemplate TargetType="Thumb">
+                    <ControlTemplate>
                       <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{DynamicResource SliderThumbCornerRadius}" />
                     </ControlTemplate>
                   </Setter.Value>
                 </Setter>
               </Style>
-            </Grid.Resources>
-            <Grid.RowDefinitions>
-              <RowDefinition Height="Auto" />
-              <RowDefinition Height="*" />
-            </Grid.RowDefinitions>
-            <ContentPresenter x:Name="HeaderContentPresenter" Grid.Row="0" Content="{TemplateBinding Header}" ContentTemplate="{TemplateBinding HeaderTemplate}" FontWeight="{DynamicResource SliderHeaderThemeFontWeight}"
-            Foreground="{DynamicResource SliderHeaderForeground}" Margin="{DynamicResource SliderTopHeaderMargin}" TextWrapping="Wrap" Visibility="Collapsed" x:DeferLoadStrategy="Lazy" />
-            <Grid x:Name="SliderContainer" Grid.Row="1" Background="{DynamicResource SliderContainerBackground}" Control.IsTemplateFocusTarget="True">
-              <Grid x:Name="HorizontalTemplate" MinHeight="{DynamicResource SliderHorizontalHeight}">
-                <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
-                <Grid.RowDefinitions>
-                  <RowDefinition Height="{DynamicResource SliderPreContentMargin}" />
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="{DynamicResource SliderPostContentMargin}" />
-                </Grid.RowDefinitions>
-                <Rectangle x:Name="HorizontalTrackRect" Fill="{TemplateBinding Background}" Height="{DynamicResource SliderTrackThemeHeight}" Grid.Row="1" Grid.ColumnSpan="3"
-                contract7Present:RadiusX="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}"
-                contract7Present:RadiusY="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}"
-                contract7NotPresent:RadiusX="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}"
-                contract7NotPresent:RadiusY="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" />
-                <Rectangle x:Name="HorizontalDecreaseRect" Fill="{TemplateBinding Foreground}" Grid.Row="1"
-                contract7Present:RadiusX="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}"
-                contract7Present:RadiusY="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}"
-                contract7NotPresent:RadiusX="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}"
-                contract7NotPresent:RadiusY="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" />
-                <TickBar x:Name="TopTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderTickBarFill}" Height="{DynamicResource SliderOutsideTickBarThemeHeight}" VerticalAlignment="Bottom" Margin="0,0,0,4" Grid.ColumnSpan="3" />
-                <TickBar x:Name="HorizontalInlineTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderInlineTickBarFill}" Height="{DynamicResource SliderTrackThemeHeight}" Grid.Row="1" Grid.ColumnSpan="3" />
-                <TickBar x:Name="BottomTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderTickBarFill}" Height="{DynamicResource SliderOutsideTickBarThemeHeight}" VerticalAlignment="Top" Margin="0,4,0,0" Grid.Row="2" Grid.ColumnSpan="3" />
-                <Thumb x:Name="HorizontalThumb" Style="{StaticResource SliderThumbStyle}" DataContext="{TemplateBinding Value}" Height="{DynamicResource SliderHorizontalThumbHeight}" Width="{DynamicResource SliderHorizontalThumbWidth}" Grid.Row="0"
-                Grid.RowSpan="3" Grid.Column="1" FocusVisualMargin="-14,-6,-14,-6" AutomationProperties.AccessibilityView="Raw" />
-              </Grid>
-              <Grid x:Name="VerticalTemplate" MinWidth="{DynamicResource SliderVerticalWidth}" Visibility="Collapsed">
-                <Grid.RowDefinitions>
-                  <RowDefinition Height="*" />
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-                </Grid.RowDefinitions>
-                <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="{DynamicResource SliderPreContentMargin}" />
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="{DynamicResource SliderPostContentMargin}" />
-                </Grid.ColumnDefinitions>
-                <Rectangle x:Name="VerticalTrackRect" Fill="{TemplateBinding Background}" Width="{DynamicResource SliderTrackThemeHeight}" Grid.Column="1" Grid.RowSpan="3"
-                contract7Present:RadiusX="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}"
-                contract7Present:RadiusY="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}"
-                contract7NotPresent:RadiusX="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}"
-                contract7NotPresent:RadiusY="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" />
-                <Rectangle x:Name="VerticalDecreaseRect" Fill="{TemplateBinding Foreground}" Grid.Column="1" Grid.Row="2"
-                contract7Present:RadiusX="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}"
-                contract7Present:RadiusY="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}"
-                contract7NotPresent:RadiusX="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}"
-                contract7NotPresent:RadiusY="{Binding Source={DynamicResource ControlCornerRadius}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" />
-                <TickBar x:Name="LeftTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderTickBarFill}" Width="{DynamicResource SliderOutsideTickBarThemeHeight}" HorizontalAlignment="Right" Margin="0,0,4,0" Grid.RowSpan="3" />
-                <TickBar x:Name="VerticalInlineTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderInlineTickBarFill}" Width="{DynamicResource SliderTrackThemeHeight}" Grid.Column="1" Grid.RowSpan="3" />
-                <TickBar x:Name="RightTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderTickBarFill}" Width="{DynamicResource SliderOutsideTickBarThemeHeight}" HorizontalAlignment="Left" Margin="4,0,0,0" Grid.Column="2"
-                Grid.RowSpan="3" />
-                <Thumb x:Name="VerticalThumb" Style="{StaticResource SliderThumbStyle}" DataContext="{TemplateBinding Value}" Width="{DynamicResource SliderVerticalThumbWidth}" Height="{DynamicResource SliderVerticalThumbHeight}" Grid.Row="1"
-                Grid.Column="0" Grid.ColumnSpan="3" FocusVisualMargin="-6,-14,-6,-14" AutomationProperties.AccessibilityView="Raw" />
+            </Border.Styles>
+            <Grid RowDefinitions="Auto,*">
+              <!-- TODO removed TextBlock.TextWrapping; bind Content -> Header and ContentTemplate -> HeaderTemplate -->
+              <ContentPresenter Name="HeaderContentPresenter" Grid.Row="0" TextBlock.FontWeight="{DynamicResource SliderHeaderThemeFontWeight}" TextBlock.Foreground="{DynamicResource SliderHeaderForeground}" Margin="{DynamicResource SliderTopHeaderMargin}"
+              IsVisible="False" />
+              <!-- TODO removed Control.IsTemplateFocusTarget -->
+              <Grid Name="SliderContainer" Grid.Row="1" Background="{DynamicResource SliderContainerBackground}">
+                <Grid Name="HorizontalTemplate" ColumnDefinitions="Auto,Auto,*" MinHeight="{DynamicResource SliderHorizontalHeight}">
+                  <Grid.RowDefinitions>
+                    <RowDefinition Height="{DynamicResource SliderPreContentMargin}" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="{DynamicResource SliderPostContentMargin}" />
+                  </Grid.RowDefinitions>
+                  <Border Name="HorizontalTrackRect" Background="{TemplateBinding Background}" Height="{DynamicResource SliderTrackThemeHeight}" Grid.Row="1" Grid.ColumnSpan="3" CornerRadius="{Binding CornerRadius}" />
+                  <Border Name="HorizontalDecreaseRect" Background="{TemplateBinding Foreground}" Grid.Row="1" CornerRadius="{Binding CornerRadius}" />
+                  <!-- TODO TickBars are not implemented yet. -->
+                  <!--
+                <TickBar Name="TopTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderTickBarFill}" Height="{DynamicResource SliderOutsideTickBarThemeHeight}" VerticalAlignment="Bottom" Margin="0,0,0,4" Grid.ColumnSpan="3" />
+                <TickBar Name="HorizontalInlineTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderInlineTickBarFill}" Height="{DynamicResource SliderTrackThemeHeight}" Grid.Row="1" Grid.ColumnSpan="3" />
+                <TickBar Name="BottomTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderTickBarFill}" Height="{DynamicResource SliderOutsideTickBarThemeHeight}" VerticalAlignment="Top" Margin="0,4,0,0" Grid.Row="2" Grid.ColumnSpan="3" />
+                -->
+                  <!-- TODO Removed FocusVisualMargin and AutomationProperties.AccessibilityView -->
+                  <Thumb Name="HorizontalThumb" Classes="SliderThumbStyle" DataContext="{TemplateBinding Value}" Height="{DynamicResource SliderHorizontalThumbHeight}" Width="{DynamicResource SliderHorizontalThumbWidth}" Grid.Row="0"
+                  Grid.RowSpan="3" Grid.Column="1" />
+                </Grid>
+                <Grid Name="VerticalTemplate" RowDefinitions="*,Auto,Auto" MinWidth="{DynamicResource SliderVerticalWidth}" IsVisible="False">
+                  <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="{DynamicResource SliderPreContentMargin}" />
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="{DynamicResource SliderPostContentMargin}" />
+                  </Grid.ColumnDefinitions>
+                  <Border Name="VerticalTrackRect" Background="{TemplateBinding Background}" Width="{DynamicResource SliderTrackThemeHeight}" Grid.Column="1" Grid.RowSpan="3" CornerRadius="{Binding CornerRadius}" />
+                  <Border Name="VerticalDecreaseRect" Background="{TemplateBinding Foreground}" Grid.Column="1" Grid.Row="2" CornerRadius="{Binding CornerRadius}" />
+                  <!-- TODO TickBars are not implemented yet. -->
+                  <!-- 
+                <TickBar Name="LeftTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderTickBarFill}" Width="{DynamicResource SliderOutsideTickBarThemeHeight}" HorizontalAlignment="Right" Margin="0,0,4,0" Grid.RowSpan="3" />
+                <TickBar Name="VerticalInlineTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderInlineTickBarFill}" Width="{DynamicResource SliderTrackThemeHeight}" Grid.Column="1" Grid.RowSpan="3" />
+                <TickBar Name="RightTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderTickBarFill}" Width="{DynamicResource SliderOutsideTickBarThemeHeight}" HorizontalAlignment="Left" Margin="4,0,0,0" Grid.Column="2" Grid.RowSpan="3" /> 
+                -->
+                  <!-- TODO Removed FocusVisualMargin and AutomationProperties.AccessibilityView-->
+                  <Thumb Name="VerticalThumb" Classes="SliderThumbStyle" DataContext="{TemplateBinding Value}" Width="{DynamicResource SliderVerticalThumbWidth}" Height="{DynamicResource SliderVerticalThumbHeight}" Grid.Row="1" Grid.Column="0"
+                  Grid.ColumnSpan="3" />
+                </Grid>
               </Grid>
             </Grid>
-          </Grid>
+          </Border>
         </ControlTemplate>
       </Setter.Value>
     </Setter>
diff --git a/src/Avalonia.Visuals/Media/Color.cs b/src/Avalonia.Visuals/Media/Color.cs
index 2e06d2578f..acacbaac36 100644
--- a/src/Avalonia.Visuals/Media/Color.cs
+++ b/src/Avalonia.Visuals/Media/Color.cs
@@ -1,4 +1,5 @@
 using System;
+using System.ComponentModel;
 using System.Globalization;
 using Avalonia.Animation.Animators;
 
@@ -7,6 +8,7 @@ namespace Avalonia.Media
     /// <summary>
     /// An ARGB color.
     /// </summary>
+    [TypeConverter(typeof(ColorToSolidColorBrushConverter))]
     public readonly struct Color : IEquatable<Color>
     {
         static Color()
diff --git a/src/Avalonia.Visuals/Media/ColorToSolidColorBrushConverter.cs b/src/Avalonia.Visuals/Media/ColorToSolidColorBrushConverter.cs
new file mode 100644
index 0000000000..fa8603c536
--- /dev/null
+++ b/src/Avalonia.Visuals/Media/ColorToSolidColorBrushConverter.cs
@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Globalization;
+using System.Linq;
+using Avalonia.Media.Immutable;
+
+namespace Avalonia.Media
+{
+    internal class ColorToSolidColorBrushConverter : TypeConverter
+    {
+        public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
+        {
+            return sourceType == typeof(string);
+        }
+
+        public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
+        {
+            return Color.Parse((string)value);
+        }
+        public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType)
+        {
+            return typeof(IBrush).IsAssignableFrom(destinationType);
+        }
+
+        public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            if (typeof(IBrush).IsAssignableFrom(destinationType))
+            {
+                return new ImmutableSolidColorBrush((Color)value);
+            }
+
+            return null;
+        }
+    }
+}
\ No newline at end of file

From b889d03405fcbfa42beb2b98690f29e1203a557a Mon Sep 17 00:00:00 2001
From: Jumar Macato <hikari.netto23@gmail.com>
Date: Thu, 28 May 2020 16:21:37 +0800
Subject: [PATCH 20/45] fixes

---
 src/Avalonia.Controls/Slider.cs        | 4 ++--
 src/Avalonia.Themes.Fluent/Slider.xaml | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/Avalonia.Controls/Slider.cs b/src/Avalonia.Controls/Slider.cs
index 9faf77d445..b7a571af18 100644
--- a/src/Avalonia.Controls/Slider.cs
+++ b/src/Avalonia.Controls/Slider.cs
@@ -98,11 +98,11 @@ namespace Avalonia.Controls
 
             if (Orientation == Orientation.Horizontal)
             {
-                _track = e.NameScope.Find<Track>("HorizontalThumb");
+                // _track = e.NameScope.Find<Track>("HorizontalThumb");
             }
             else
             {
-                _track = e.NameScope.Find<Track>("VerticalThumb");
+                // _track = e.NameScope.Find<Track>("VerticalThumb");
             }
 
             // _increaseButton = e.NameScope.Find<Button>("PART_IncreaseButton");
diff --git a/src/Avalonia.Themes.Fluent/Slider.xaml b/src/Avalonia.Themes.Fluent/Slider.xaml
index 523619fc5f..b790271dc0 100644
--- a/src/Avalonia.Themes.Fluent/Slider.xaml
+++ b/src/Avalonia.Themes.Fluent/Slider.xaml
@@ -5,7 +5,7 @@
     <x:Double x:Key="SliderPostContentMargin">15</x:Double>
     <x:Double x:Key="SliderHorizontalHeight">32</x:Double>
     <x:Double x:Key="SliderVerticalWidth">32</x:Double>
-    <Thickness x:Key="SliderThumbCornerRadius">10</Thickness>
+    <CornerRadius x:Key="SliderThumbCornerRadius">10</>
     <x:Double x:Key="SliderHorizontalThumbWidth">20</x:Double>
     <x:Double x:Key="SliderHorizontalThumbHeight">20</x:Double>
     <x:Double x:Key="SliderVerticalThumbWidth">20</x:Double>
@@ -95,6 +95,7 @@
   <Style Selector="Slider:pointerover /template/ Border#VerticalDecreaseRect">
     <Setter Property="Background" Value="{DynamicResource SliderTrackValueFillPointerOver}" />
   </Style>
+  
   <!-- TODO: We don't have an equivalent for this afaik. -->
   <!-- <VisualState Name="FocusDisengaged" />
   <VisualState Name="FocusEngagedHorizontal">
@@ -183,7 +184,7 @@
                   <Thumb Name="HorizontalThumb" Classes="SliderThumbStyle" DataContext="{TemplateBinding Value}" Height="{DynamicResource SliderHorizontalThumbHeight}" Width="{DynamicResource SliderHorizontalThumbWidth}" Grid.Row="0"
                   Grid.RowSpan="3" Grid.Column="1" />
                 </Grid>
-                <Grid Name="VerticalTemplate" RowDefinitions="*,Auto,Auto" MinWidth="{DynamicResource SliderVerticalWidth}" IsVisible="False">
+                <Grid Name="VerticalTemplate" RowDefinitions="*,Auto,Auto" MinWidth="{DynamicResource SliderVerticalWidth}">
                   <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="{DynamicResource SliderPreContentMargin}" />
                     <ColumnDefinition Width="Auto" />

From 9ec4e54e9f95dab1c8fed196f9f613307dadea6e Mon Sep 17 00:00:00 2001
From: Jumar Macato <hikari.netto23@gmail.com>
Date: Thu, 28 May 2020 18:35:40 +0800
Subject: [PATCH 21/45] fix

---
 src/Avalonia.Themes.Fluent/Slider.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Themes.Fluent/Slider.xaml b/src/Avalonia.Themes.Fluent/Slider.xaml
index b790271dc0..b4a0eee98a 100644
--- a/src/Avalonia.Themes.Fluent/Slider.xaml
+++ b/src/Avalonia.Themes.Fluent/Slider.xaml
@@ -5,7 +5,7 @@
     <x:Double x:Key="SliderPostContentMargin">15</x:Double>
     <x:Double x:Key="SliderHorizontalHeight">32</x:Double>
     <x:Double x:Key="SliderVerticalWidth">32</x:Double>
-    <CornerRadius x:Key="SliderThumbCornerRadius">10</>
+    <CornerRadius x:Key="SliderThumbCornerRadius">10</CornerRadius>
     <x:Double x:Key="SliderHorizontalThumbWidth">20</x:Double>
     <x:Double x:Key="SliderHorizontalThumbHeight">20</x:Double>
     <x:Double x:Key="SliderVerticalThumbWidth">20</x:Double>

From 099feb1f2c2d0bd0b4a966d9dd57629547bf9b57 Mon Sep 17 00:00:00 2001
From: Jumar Macato <hikari.netto23@gmail.com>
Date: Thu, 28 May 2020 21:41:09 +0800
Subject: [PATCH 22/45] remove hacks

---
 src/Avalonia.Visuals/Media/Color.cs           |  1 -
 .../Media/ColorToSolidColorBrushConverter.cs  | 36 -------------------
 2 files changed, 37 deletions(-)
 delete mode 100644 src/Avalonia.Visuals/Media/ColorToSolidColorBrushConverter.cs

diff --git a/src/Avalonia.Visuals/Media/Color.cs b/src/Avalonia.Visuals/Media/Color.cs
index acacbaac36..85808698f9 100644
--- a/src/Avalonia.Visuals/Media/Color.cs
+++ b/src/Avalonia.Visuals/Media/Color.cs
@@ -8,7 +8,6 @@ namespace Avalonia.Media
     /// <summary>
     /// An ARGB color.
     /// </summary>
-    [TypeConverter(typeof(ColorToSolidColorBrushConverter))]
     public readonly struct Color : IEquatable<Color>
     {
         static Color()
diff --git a/src/Avalonia.Visuals/Media/ColorToSolidColorBrushConverter.cs b/src/Avalonia.Visuals/Media/ColorToSolidColorBrushConverter.cs
deleted file mode 100644
index fa8603c536..0000000000
--- a/src/Avalonia.Visuals/Media/ColorToSolidColorBrushConverter.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Globalization;
-using System.Linq;
-using Avalonia.Media.Immutable;
-
-namespace Avalonia.Media
-{
-    internal class ColorToSolidColorBrushConverter : TypeConverter
-    {
-        public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
-        {
-            return sourceType == typeof(string);
-        }
-
-        public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
-        {
-            return Color.Parse((string)value);
-        }
-        public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType)
-        {
-            return typeof(IBrush).IsAssignableFrom(destinationType);
-        }
-
-        public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
-        {
-            if (typeof(IBrush).IsAssignableFrom(destinationType))
-            {
-                return new ImmutableSolidColorBrush((Color)value);
-            }
-
-            return null;
-        }
-    }
-}
\ No newline at end of file

From 1f25cf737bf8f2fc7dfdd331afba8bebecad8ad8 Mon Sep 17 00:00:00 2001
From: Jumar Macato <hikari.netto23@gmail.com>
Date: Thu, 28 May 2020 21:51:23 +0800
Subject: [PATCH 23/45] addtional things

---
 src/Avalonia.Themes.Fluent/Slider.xaml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Slider.xaml b/src/Avalonia.Themes.Fluent/Slider.xaml
index b4a0eee98a..bb7a4cda8e 100644
--- a/src/Avalonia.Themes.Fluent/Slider.xaml
+++ b/src/Avalonia.Themes.Fluent/Slider.xaml
@@ -1,8 +1,8 @@
 <Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <Styles.Resources>
     <Thickness x:Key="SliderTopHeaderMargin">0,0,0,4</Thickness>
-    <x:Double x:Key="SliderPreContentMargin">15</x:Double>
-    <x:Double x:Key="SliderPostContentMargin">15</x:Double>
+    <GridLength x:Key="SliderPreContentMargin">15</GridLength>
+    <GridLength x:Key="SliderPostContentMargin">15</GridLength>
     <x:Double x:Key="SliderHorizontalHeight">32</x:Double>
     <x:Double x:Key="SliderVerticalWidth">32</x:Double>
     <CornerRadius x:Key="SliderThumbCornerRadius">10</CornerRadius>
@@ -27,10 +27,10 @@
   <Style Selector="Slider:disabled /template/ Border#VerticalTrackRect">
     <Setter Property="Background" Value="{DynamicResource SliderTrackFillDisabled}" />
   </Style>
-  <Style Selector="Slider:disabled /template/ Thumb#HorizontalThumb">
+  <Style Selector="Slider:disabled /template/ Thumb#HorizontalThumb /template/ Border">
     <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundDisabled}" />
   </Style>
-  <Style Selector="Slider:disabled /template/ Thumb#VerticalThumb">
+  <Style Selector="Slider:disabled /template/ Thumb#VerticalThumb /template/ Border">
     <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundDisabled}" />
   </Style>
   <!-- <Style Selector="Slider:disabled /template/ TickBar#TopTickBar">
@@ -58,10 +58,10 @@
   <Style Selector="Slider:pressed /template/ Border#VerticalTrackRect">
     <Setter Property="Background" Value="{DynamicResource SliderTrackFillPressed}" />
   </Style>
-  <Style Selector="Slider:pressed /template/ Thumb#HorizontalThumb">
+  <Style Selector="Slider:pressed /template/ Thumb#HorizontalThumb /template/ Border">
     <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundPressed}" />
   </Style>
-  <Style Selector="Slider:pressed /template/ Thumb#VerticalThumb">
+  <Style Selector="Slider:pressed /template/ Thumb#VerticalThumb /template/ Border">
     <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundPressed}" />
   </Style>
   <Style Selector="Slider:pressed /template/ Grid#SliderContainer">
@@ -80,10 +80,10 @@
   <Style Selector="Slider:pointerover /template/ Border#VerticalTrackRect">
     <Setter Property="Background" Value="{DynamicResource SliderTrackFillPointerOver}" />
   </Style>
-  <Style Selector="Slider:pointerover /template/ Thumb#HorizontalThumb">
+  <Style Selector="Slider:pointerover /template/ Thumb#HorizontalThumb /template/ Border">
     <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundPointerOver}" />
   </Style>
-  <Style Selector="Slider:pointerover /template/ Thumb#VerticalThumb">
+  <Style Selector="Slider:pointerover /template/ Thumb#VerticalThumb /template/ Border">
     <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundPointerOver}" />
   </Style>
   <Style Selector="Slider:pointerover /template/ Grid#SliderContainer">

From a1a1125cc662efb755777c0ea9f33b2950cca8ec Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Thu, 28 May 2020 21:40:29 -0300
Subject: [PATCH 24/45] working horizontal slider.

---
 src/Avalonia.Themes.Fluent/Slider.xaml | 312 +++++++++++--------------
 1 file changed, 133 insertions(+), 179 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Slider.xaml b/src/Avalonia.Themes.Fluent/Slider.xaml
index bb7a4cda8e..1bb76b1606 100644
--- a/src/Avalonia.Themes.Fluent/Slider.xaml
+++ b/src/Avalonia.Themes.Fluent/Slider.xaml
@@ -1,4 +1,9 @@
 <Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <Design.PreviewWith>
+    <Border Margin="20" Width="200">
+      <Slider Value="50" />
+    </Border>
+  </Design.PreviewWith>
   <Styles.Resources>
     <Thickness x:Key="SliderTopHeaderMargin">0,0,0,4</Thickness>
     <GridLength x:Key="SliderPreContentMargin">15</GridLength>
@@ -11,202 +16,151 @@
     <x:Double x:Key="SliderVerticalThumbWidth">20</x:Double>
     <x:Double x:Key="SliderVerticalThumbHeight">20</x:Double>
   </Styles.Resources>
-  <!-- Disabled State -->
-  <!-- <Style Selector="Slider:disabled /template/ ContentPresenter#HeaderContentPresenter">
-    <Setter Property="Foreground" Value="{DynamicResource SliderHeaderForegroundDisabled}" />
-  </Style> -->
-  <Style Selector="Slider:disabled /template/ Border#HorizontalDecreaseRect">
-    <Setter Property="Background" Value="{DynamicResource SliderTrackValueFillDisabled}" />
-  </Style>
-  <Style Selector="Slider:disabled /template/ Border#HorizontalTrackRect">
-    <Setter Property="Background" Value="{DynamicResource SliderTrackFillDisabled}" />
-  </Style>
-  <Style Selector="Slider:disabled /template/ Border#VerticalDecreaseRect">
-    <Setter Property="Background" Value="{DynamicResource SliderTrackValueFillDisabled}" />
-  </Style>
-  <Style Selector="Slider:disabled /template/ Border#VerticalTrackRect">
-    <Setter Property="Background" Value="{DynamicResource SliderTrackFillDisabled}" />
-  </Style>
-  <Style Selector="Slider:disabled /template/ Thumb#HorizontalThumb /template/ Border">
-    <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundDisabled}" />
-  </Style>
-  <Style Selector="Slider:disabled /template/ Thumb#VerticalThumb /template/ Border">
-    <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundDisabled}" />
-  </Style>
-  <!-- <Style Selector="Slider:disabled /template/ TickBar#TopTickBar">
-    <Setter Property="Background" Value="{DynamicResource SliderTickBarFillDisabled}" />
-  </Style>
-  <Style Selector="Slider:disabled /template/ TickBar#BottomTickBar">
-    <Setter Property="Background" Value="{DynamicResource SliderTickBarFillDisabled}" />
-  </Style>
-  <Style Selector="Slider:disabled /template/ TickBar#LeftTickBar">
-    <Setter Property="Background" Value="{DynamicResource SliderTickBarFillDisabled}" />
-  </Style>
-  <Style Selector="Slider:disabled /template/ TickBar#RightTickBar">
-    <Setter Property="Background" Value="{DynamicResource SliderTickBarFillDisabled}" />
-  </Style> -->
-  <Style Selector="Slider:disabled /template/ Grid#SliderContainer">
-    <Setter Property="Background" Value="{DynamicResource SliderContainerBackgroundDisabled}" />
-  </Style>
-  <!-- Pressed State -->
-  <Style Selector="Slider:pressed /template/ Border#HorizontalTrackRect">
-    <Setter Property="Background" Value="{DynamicResource SliderTrackFillPressed}" />
-  </Style>
-  <Style Selector="Slider:pressed /template/ Border#HorizontalTrackRect">
-    <Setter Property="Background" Value="{DynamicResource SliderTrackFillPressed}" />
-  </Style>
-  <Style Selector="Slider:pressed /template/ Border#VerticalTrackRect">
-    <Setter Property="Background" Value="{DynamicResource SliderTrackFillPressed}" />
-  </Style>
-  <Style Selector="Slider:pressed /template/ Thumb#HorizontalThumb /template/ Border">
-    <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundPressed}" />
-  </Style>
-  <Style Selector="Slider:pressed /template/ Thumb#VerticalThumb /template/ Border">
-    <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundPressed}" />
-  </Style>
-  <Style Selector="Slider:pressed /template/ Grid#SliderContainer">
-    <Setter Property="Background" Value="{DynamicResource SliderContainerBackgroundPressed}" />
-  </Style>
-  <Style Selector="Slider:pressed /template/ Border#HorizontalDecreaseRect">
-    <Setter Property="Background" Value="{DynamicResource SliderTrackValueFillPressed}" />
-  </Style>
-  <Style Selector="Slider:pressed /template/ Border#VerticalDecreaseRect">
-    <Setter Property="Background" Value="{DynamicResource SliderTrackValueFillPressed}" />
-  </Style>
-  <!-- PointerOver State -->
-  <Style Selector="Slider:pointerover /template/ Border#HorizontalTrackRect">
-    <Setter Property="Background" Value="{DynamicResource SliderTrackFillPointerOver}" />
-  </Style>
-  <Style Selector="Slider:pointerover /template/ Border#VerticalTrackRect">
-    <Setter Property="Background" Value="{DynamicResource SliderTrackFillPointerOver}" />
-  </Style>
-  <Style Selector="Slider:pointerover /template/ Thumb#HorizontalThumb /template/ Border">
-    <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundPointerOver}" />
-  </Style>
-  <Style Selector="Slider:pointerover /template/ Thumb#VerticalThumb /template/ Border">
-    <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundPointerOver}" />
-  </Style>
-  <Style Selector="Slider:pointerover /template/ Grid#SliderContainer">
-    <Setter Property="Background" Value="{DynamicResource SliderContainerBackgroundPointerOver}" />
-  </Style>
-  <Style Selector="Slider:pointerover /template/ Border#HorizontalDecreaseRect">
-    <Setter Property="Background" Value="{DynamicResource SliderTrackValueFillPointerOver}" />
-  </Style>
-  <Style Selector="Slider:pointerover /template/ Border#VerticalDecreaseRect">
-    <Setter Property="Background" Value="{DynamicResource SliderTrackValueFillPointerOver}" />
-  </Style>
-  
-  <!-- TODO: We don't have an equivalent for this afaik. -->
-  <!-- <VisualState Name="FocusDisengaged" />
-  <VisualState Name="FocusEngagedHorizontal">
-    <Storyboard>
-      <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SliderContainer" Storyboard.TargetProperty="(Control.IsTemplateFocusTarget)">
-        <DiscreteObjectKeyFrame KeyTime="0" Value="False" />
-      </ObjectAnimationUsingKeyFrames>
-      <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HorizontalThumb" Storyboard.TargetProperty="(Control.IsTemplateFocusTarget)">
-        <DiscreteObjectKeyFrame KeyTime="0" Value="True" />
-      </ObjectAnimationUsingKeyFrames>
-    </Storyboard>
-  </VisualState>
-  <VisualState Name="FocusEngagedVertical">
-    <Storyboard>
-      <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SliderContainer" Storyboard.TargetProperty="(Control.IsTemplateFocusTarget)">
-        <DiscreteObjectKeyFrame KeyTime="0" Value="False" />
-      </ObjectAnimationUsingKeyFrames>
-      <ObjectAnimationUsingKeyFrames Storyboard.TargetName="VerticalThumb" Storyboard.TargetProperty="(Control.IsTemplateFocusTarget)">
-        <DiscreteObjectKeyFrame KeyTime="0" Value="True" />
-      </ObjectAnimationUsingKeyFrames>
-    </Storyboard>
-     --> 
-    
-  <Style Selector="Slider:vertical /template/ Grid#VerticalTemplate">
-    <Setter Property="IsVisible" Value="True" />
-  </Style>
-  <Style Selector="Slider:vertical /template/ Grid#HorizontalTemplate">
-    <Setter Property="IsVisible" Value="False" />
-  </Style>
-  <Style Selector="Slider:horizontal /template/ Grid#HorizontalTemplate">
-    <Setter Property="IsVisible" Value="True" />
-  </Style>
-  <Style Selector="Slider:horizontal /template/ Grid#VerticalTemplate">
-    <Setter Property="IsVisible" Value="False" />
-  </Style>
-
-  <Style Selector="Slider">
+  <Style Selector="Slider:horizontal">
     <Setter Property="Background" Value="{DynamicResource SliderTrackFill}" />
     <Setter Property="BorderThickness" Value="{DynamicResource SliderBorderThemeThickness}" />
     <Setter Property="Foreground" Value="{DynamicResource SliderTrackValueFill}" />
     <Setter Property="FontFamily" Value="{DynamicResource ContentControlThemeFontFamily}" />
     <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-    <!-- TODO Non-existent properties in avalonia. -->
-    <!-- <Setter Property="ManipulationMode" Value="None" />
-    <Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
-    <Setter Property="FocusVisualMargin" Value="-7,0,-7,0" />
-    <Setter Property="IsFocusEngagementEnabled" Value="True" /> -->
     <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate>
-          <Border Margin="{TemplateBinding Padding}" CornerRadius="{DynamicResource ControlCornerRadius}">
-            <Border.Styles>
+      <ControlTemplate>
+        <Border BorderThickness="{TemplateBinding BorderThickness}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                CornerRadius="{DynamicResource ControlCornerRadius}">
+
+          <Grid Name="grid" Margin="{TemplateBinding Padding}" RowDefinitions="Auto, *">
+            <Grid.Styles>
               <Style Selector="Thumb.SliderThumbStyle">
-                <Setter Property="BorderThickness" Value="0" />
-                <Setter Property="Background" Value="{DynamicResource SliderThumbBackground}" />
+                <Setter Property="BorderThickness" Value="0" />                
                 <Setter Property="Template">
                   <Setter.Value>
                     <ControlTemplate>
-                      <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{DynamicResource SliderThumbCornerRadius}" />
+                      <Border Background="{TemplateBinding Background}"
+                              BorderBrush="{TemplateBinding BorderBrush}"
+                              BorderThickness="{TemplateBinding BorderThickness}"
+                              CornerRadius="{DynamicResource SliderThumbCornerRadius}" />
                     </ControlTemplate>
                   </Setter.Value>
                 </Setter>
               </Style>
-            </Border.Styles>
-            <Grid RowDefinitions="Auto,*">
-              <!-- TODO removed TextBlock.TextWrapping; bind Content -> Header and ContentTemplate -> HeaderTemplate -->
-              <ContentPresenter Name="HeaderContentPresenter" Grid.Row="0" TextBlock.FontWeight="{DynamicResource SliderHeaderThemeFontWeight}" TextBlock.Foreground="{DynamicResource SliderHeaderForeground}" Margin="{DynamicResource SliderTopHeaderMargin}"
-              IsVisible="False" />
-              <!-- TODO removed Control.IsTemplateFocusTarget -->
-              <Grid Name="SliderContainer" Grid.Row="1" Background="{DynamicResource SliderContainerBackground}">
-                <Grid Name="HorizontalTemplate" ColumnDefinitions="Auto,Auto,*" MinHeight="{DynamicResource SliderHorizontalHeight}">
-                  <Grid.RowDefinitions>
-                    <RowDefinition Height="{DynamicResource SliderPreContentMargin}" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="{DynamicResource SliderPostContentMargin}" />
-                  </Grid.RowDefinitions>
-                  <Border Name="HorizontalTrackRect" Background="{TemplateBinding Background}" Height="{DynamicResource SliderTrackThemeHeight}" Grid.Row="1" Grid.ColumnSpan="3" CornerRadius="{Binding CornerRadius}" />
-                  <Border Name="HorizontalDecreaseRect" Background="{TemplateBinding Foreground}" Grid.Row="1" CornerRadius="{Binding CornerRadius}" />
-                  <!-- TODO TickBars are not implemented yet. -->
-                  <!--
-                <TickBar Name="TopTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderTickBarFill}" Height="{DynamicResource SliderOutsideTickBarThemeHeight}" VerticalAlignment="Bottom" Margin="0,0,0,4" Grid.ColumnSpan="3" />
-                <TickBar Name="HorizontalInlineTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderInlineTickBarFill}" Height="{DynamicResource SliderTrackThemeHeight}" Grid.Row="1" Grid.ColumnSpan="3" />
-                <TickBar Name="BottomTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderTickBarFill}" Height="{DynamicResource SliderOutsideTickBarThemeHeight}" VerticalAlignment="Top" Margin="0,4,0,0" Grid.Row="2" Grid.ColumnSpan="3" />
-                -->
-                  <!-- TODO Removed FocusVisualMargin and AutomationProperties.AccessibilityView -->
-                  <Thumb Name="HorizontalThumb" Classes="SliderThumbStyle" DataContext="{TemplateBinding Value}" Height="{DynamicResource SliderHorizontalThumbHeight}" Width="{DynamicResource SliderHorizontalThumbWidth}" Grid.Row="0"
-                  Grid.RowSpan="3" Grid.Column="1" />
-                </Grid>
-                <Grid Name="VerticalTemplate" RowDefinitions="*,Auto,Auto" MinWidth="{DynamicResource SliderVerticalWidth}">
-                  <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="{DynamicResource SliderPreContentMargin}" />
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="{DynamicResource SliderPostContentMargin}" />
-                  </Grid.ColumnDefinitions>
-                  <Border Name="VerticalTrackRect" Background="{TemplateBinding Background}" Width="{DynamicResource SliderTrackThemeHeight}" Grid.Column="1" Grid.RowSpan="3" CornerRadius="{Binding CornerRadius}" />
-                  <Border Name="VerticalDecreaseRect" Background="{TemplateBinding Foreground}" Grid.Column="1" Grid.Row="2" CornerRadius="{Binding CornerRadius}" />
-                  <!-- TODO TickBars are not implemented yet. -->
-                  <!-- 
-                <TickBar Name="LeftTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderTickBarFill}" Width="{DynamicResource SliderOutsideTickBarThemeHeight}" HorizontalAlignment="Right" Margin="0,0,4,0" Grid.RowSpan="3" />
-                <TickBar Name="VerticalInlineTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderInlineTickBarFill}" Width="{DynamicResource SliderTrackThemeHeight}" Grid.Column="1" Grid.RowSpan="3" />
-                <TickBar Name="RightTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderTickBarFill}" Width="{DynamicResource SliderOutsideTickBarThemeHeight}" HorizontalAlignment="Left" Margin="4,0,0,0" Grid.Column="2" Grid.RowSpan="3" /> 
-                -->
-                  <!-- TODO Removed FocusVisualMargin and AutomationProperties.AccessibilityView-->
-                  <Thumb Name="VerticalThumb" Classes="SliderThumbStyle" DataContext="{TemplateBinding Value}" Width="{DynamicResource SliderVerticalThumbWidth}" Height="{DynamicResource SliderVerticalThumbHeight}" Grid.Row="1" Grid.Column="0"
+            </Grid.Styles>
+            <ContentPresenter x:Name="HeaderContentPresenter"
+                             Grid.Row="0"
+                           
+                             TextBlock.FontWeight="{DynamicResource SliderHeaderThemeFontWeight}"
+                             TextBlock.Foreground="{DynamicResource SliderHeaderForeground}"
+                             Margin="{DynamicResource SliderTopHeaderMargin}" />
+            <Grid x:Name="SliderContainer"
+                              Grid.Row="1">
+              <Grid x:Name="HorizontalTemplate" MinHeight="{DynamicResource SliderHorizontalHeight}">
+
+                <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="Auto" />
+                  <ColumnDefinition Width="Auto" />
+                  <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
+
+                <Grid.RowDefinitions>
+                  <RowDefinition Height="{DynamicResource SliderPreContentMargin}" />
+                  <RowDefinition Height="Auto" />
+                  <RowDefinition Height="{DynamicResource SliderPostContentMargin}" />
+                </Grid.RowDefinitions>
+
+                <!--
+              <TickBar x:Name="TopTickBar"
+                  Visibility="Collapsed"
+                  Fill="{DynamicResource SliderTickBarFill}"
+                  Height="{DynamicResource SliderOutsideTickBarThemeHeight}"
+                  VerticalAlignment="Bottom"
+                  Margin="0,0,0,4"
+                  Grid.ColumnSpan="3" />
+              <TickBar x:Name="HorizontalInlineTickBar"
+                  Visibility="Collapsed"
+                  Fill="{DynamicResource SliderInlineTickBarFill}"
+                  Height="{DynamicResource SliderTrackThemeHeight}"
+                  Grid.Row="1"
                   Grid.ColumnSpan="3" />
-                </Grid>
+              <TickBar x:Name="BottomTickBar"
+                  Visibility="Collapsed"
+                  Fill="{DynamicResource SliderTickBarFill}"
+                  Height="{DynamicResource SliderOutsideTickBarThemeHeight}"
+                  VerticalAlignment="Top"
+                  Margin="0,4,0,0"
+                  Grid.Row="2"
+                  Grid.ColumnSpan="3" /> -->
+
+                <Track Name="PART_Track"
+                       Grid.Row="1"
+                       Grid.ColumnSpan="3"
+                       
+                       Orientation="Horizontal">
+                  <Track.DecreaseButton>
+                    <RepeatButton Name="PART_DecreaseButton" Background="{TemplateBinding Foreground}">
+                      <RepeatButton.Template>
+                        <ControlTemplate>
+                          <Border Name="TrackBackground" Background="{TemplateBinding Background}" CornerRadius="{DynamicResource ControlCornerRadius}" Height="{DynamicResource SliderTrackThemeHeight}" VerticalAlignment="Center"/>
+                        </ControlTemplate>
+                      </RepeatButton.Template>
+                    </RepeatButton>
+                  </Track.DecreaseButton>
+                  <Track.IncreaseButton>
+                    <RepeatButton Name="PART_IncreaseButton" Margin="0" Padding="0" Background="{TemplateBinding Background}"
+                                  Classes="repeattrack">
+                      <RepeatButton.Template>
+                        <ControlTemplate>
+                          <Border Name="TrackBackground" Background="{TemplateBinding Background}" CornerRadius="{DynamicResource ControlCornerRadius}" Height="{DynamicResource SliderTrackThemeHeight}" VerticalAlignment="Center"/>
+                        </ControlTemplate>
+                      </RepeatButton.Template>
+                    </RepeatButton>
+                  </Track.IncreaseButton>
+                  <Thumb Classes="SliderThumbStyle" 
+                         Name="thumb" 
+                         Margin="0" Padding="0" 
+                         DataContext="{TemplateBinding Value}" 
+                         Height="{DynamicResource SliderHorizontalThumbHeight}" 
+                         Width="{DynamicResource SliderHorizontalThumbWidth}" />
+                </Track>
               </Grid>
             </Grid>
-          </Border>
-        </ControlTemplate>
-      </Setter.Value>
+          </Grid>
+        </Border>
+      </ControlTemplate>
     </Setter>
   </Style>
+
+  <Style Selector="Slider /template/ Track#PART_Track">
+    <Setter Property="Minimum" Value="{TemplateBinding Minimum}"/>
+    <Setter Property="Maximum" Value="{TemplateBinding Maximum}"/>
+    <Setter Property="Value" Value="{TemplateBinding Value, Mode=TwoWay}"/>
+  </Style>
+
+  <!-- Normal State -->
+  <Style Selector="Slider /template/ Thumb.SliderThumbStyle">
+    <Setter Property="Background" Value="{DynamicResource SliderThumbBackground}" />
+  </Style>
+  
+  <Style Selector="Slider /template/ Grid#SliderContainer">
+    <Setter Property="Background" Value="{DynamicResource SliderContainerBackground}" />
+  </Style>  
+
+  <!-- Pressed State -->
+
+  <!-- Disabled State -->
+
+  <!-- PointerOver State -->
+  <Style Selector="Slider:pointerover /template/ RepeatButton#PART_IncreaseButton">
+    <Setter Property="Background" Value="{DynamicResource SliderTrackFillPointerOver}" />
+  </Style>  
+
+  <Style Selector="Slider:pointerover /template/ Thumb.SliderThumbStyle">
+    <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundPointerOver}" />
+  </Style>
+
+  <Style Selector="Slider:pointerover /template/ Grid#SliderContainer">
+    <Setter Property="Background" Value="{DynamicResource SliderContainerBackgroundPointerOver}" />
+  </Style>
+
+  <Style Selector="Slider:pointerover /template/ RepeatButton#PART_DecreaseButton">
+    <Setter Property="Background" Value="{DynamicResource SliderTrackValueFillPointerOver}" />
+  </Style>
 </Styles>

From 430a428c2fccef9a326787851214354bd8be78cd Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Thu, 28 May 2020 22:27:48 -0300
Subject: [PATCH 25/45] add pressed and disabled states.

---
 src/Avalonia.Controls/Slider.cs        | 21 +++++++++
 src/Avalonia.Themes.Fluent/Slider.xaml | 61 +++++++++++++++++++++-----
 2 files changed, 70 insertions(+), 12 deletions(-)

diff --git a/src/Avalonia.Controls/Slider.cs b/src/Avalonia.Controls/Slider.cs
index b7a571af18..0155ff211a 100644
--- a/src/Avalonia.Controls/Slider.cs
+++ b/src/Avalonia.Controls/Slider.cs
@@ -44,6 +44,9 @@ namespace Avalonia.Controls
             Thumb.DragStartedEvent.AddClassHandler<Slider>((x, e) => x.OnThumbDragStarted(e), RoutingStrategies.Bubble);
             Thumb.DragDeltaEvent.AddClassHandler<Slider>((x, e) => x.OnThumbDragDelta(e), RoutingStrategies.Bubble);
             Thumb.DragCompletedEvent.AddClassHandler<Slider>((x, e) => x.OnThumbDragCompleted(e), RoutingStrategies.Bubble);
+            PointerPressedEvent.AddClassHandler<Slider>((x, e) => x.HandlePointerPressed(e), RoutingStrategies.Tunnel, true);
+            PointerReleasedEvent.AddClassHandler<Slider>((x, e) => x.HandlePointerReleased(), RoutingStrategies.Tunnel, true);
+            PointerCaptureLostEvent.AddClassHandler<Slider>((x, e) => x.HandlePointerReleased(), RoutingStrategies.Tunnel, true);
         }
 
         /// <summary>
@@ -207,6 +210,24 @@ namespace Avalonia.Controls
             return value;
         }
 
+        private void HandlePointerPressed(PointerPressedEventArgs e)
+        {
+            if (e.GetCurrentPoint(this).Properties.IsLeftButtonPressed)
+            {
+                UpdatePseudoClasses(true);
+            }
+        }
+
+        private void HandlePointerReleased()
+        {
+            UpdatePseudoClasses(false);
+        }
+
+        private void UpdatePseudoClasses(bool isPressed)
+        {
+            PseudoClasses.Set(":pressed", isPressed);
+        }
+
         private void UpdatePseudoClasses(Orientation o)
         {
             PseudoClasses.Set(":vertical", o == Orientation.Vertical);
diff --git a/src/Avalonia.Themes.Fluent/Slider.xaml b/src/Avalonia.Themes.Fluent/Slider.xaml
index 1bb76b1606..3db372725a 100644
--- a/src/Avalonia.Themes.Fluent/Slider.xaml
+++ b/src/Avalonia.Themes.Fluent/Slider.xaml
@@ -1,7 +1,10 @@
 <Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <Design.PreviewWith>
     <Border Margin="20" Width="200">
-      <Slider Value="50" />
+      <StackPanel Spacing="10">
+        <Slider Value="50" />
+        <Slider IsEnabled="False" Value="50" />
+      </StackPanel>
     </Border>
   </Design.PreviewWith>
   <Styles.Resources>
@@ -31,7 +34,7 @@
           <Grid Name="grid" Margin="{TemplateBinding Padding}" RowDefinitions="Auto, *">
             <Grid.Styles>
               <Style Selector="Thumb.SliderThumbStyle">
-                <Setter Property="BorderThickness" Value="0" />                
+                <Setter Property="BorderThickness" Value="0" />
                 <Setter Property="Template">
                   <Setter.Value>
                     <ControlTemplate>
@@ -113,11 +116,11 @@
                       </RepeatButton.Template>
                     </RepeatButton>
                   </Track.IncreaseButton>
-                  <Thumb Classes="SliderThumbStyle" 
-                         Name="thumb" 
-                         Margin="0" Padding="0" 
-                         DataContext="{TemplateBinding Value}" 
-                         Height="{DynamicResource SliderHorizontalThumbHeight}" 
+                  <Thumb Classes="SliderThumbStyle"
+                         Name="thumb"
+                         Margin="0" Padding="0"
+                         DataContext="{TemplateBinding Value}"
+                         Height="{DynamicResource SliderHorizontalThumbHeight}"
                          Width="{DynamicResource SliderHorizontalThumbWidth}" />
                 </Track>
               </Grid>
@@ -138,19 +141,36 @@
   <Style Selector="Slider /template/ Thumb.SliderThumbStyle">
     <Setter Property="Background" Value="{DynamicResource SliderThumbBackground}" />
   </Style>
-  
+
   <Style Selector="Slider /template/ Grid#SliderContainer">
     <Setter Property="Background" Value="{DynamicResource SliderContainerBackground}" />
-  </Style>  
-
-  <!-- Pressed State -->
+  </Style>
 
   <!-- Disabled State -->
+  <Style Selector="Slider:disabled /template/ ContentPresenter#HeaderContentPresenter">
+    <Setter Property="TextBlock.Foreground" Value="{DynamicResource SliderHeaderForegroundDisabled}" />
+  </Style>
+
+  <Style Selector="Slider:disabled /template/ RepeatButton#PART_DecreaseButton">
+    <Setter Property="Background" Value="{DynamicResource SliderTrackValueFillDisabled}" />
+  </Style>
+
+  <Style Selector="Slider:disabled /template/ RepeatButton#PART_IncreaseButton">
+    <Setter Property="Background" Value="{DynamicResource SliderTrackFillDisabled}" />
+  </Style>
+
+  <Style Selector="Slider:disabled /template/ Thumb.SliderThumbStyle">
+    <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundDisabled}" />
+  </Style>
+
+  <Style Selector="Slider:pointerover /template/ Grid#SliderContainer">
+    <Setter Property="Background" Value="{DynamicResource SliderContainerBackgroundDisabled}" />
+  </Style>
 
   <!-- PointerOver State -->
   <Style Selector="Slider:pointerover /template/ RepeatButton#PART_IncreaseButton">
     <Setter Property="Background" Value="{DynamicResource SliderTrackFillPointerOver}" />
-  </Style>  
+  </Style>
 
   <Style Selector="Slider:pointerover /template/ Thumb.SliderThumbStyle">
     <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundPointerOver}" />
@@ -163,4 +183,21 @@
   <Style Selector="Slider:pointerover /template/ RepeatButton#PART_DecreaseButton">
     <Setter Property="Background" Value="{DynamicResource SliderTrackValueFillPointerOver}" />
   </Style>
+
+  <!-- Pressed State -->
+  <Style Selector="Slider:pressed /template/ RepeatButton#PART_IncreaseButton">
+    <Setter Property="Background" Value="{DynamicResource SliderTrackFillPressed}" />
+  </Style>
+
+  <Style Selector="Slider:pressed /template/ Thumb.SliderThumbStyle">
+    <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundPressed}" />
+  </Style>
+
+  <Style Selector="Slider:pointerover /template/ Grid#SliderContainer">
+    <Setter Property="Background" Value="{DynamicResource SliderContainerBackgroundPressed}" />
+  </Style>
+
+  <Style Selector="Slider:pointerover /template/ RepeatButton#PART_DecreaseButton">
+    <Setter Property="Background" Value="{DynamicResource SliderTrackValueFillPressed}" />
+  </Style>
 </Styles>

From c144810168fe2464e9e2d5a107d3c1e4324e0398 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Thu, 28 May 2020 22:31:20 -0300
Subject: [PATCH 26/45] designer preview for slider has horizontal and vertical
 sliders.

---
 src/Avalonia.Themes.Fluent/Slider.xaml | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Slider.xaml b/src/Avalonia.Themes.Fluent/Slider.xaml
index 3db372725a..13080e6212 100644
--- a/src/Avalonia.Themes.Fluent/Slider.xaml
+++ b/src/Avalonia.Themes.Fluent/Slider.xaml
@@ -1,10 +1,16 @@
 <Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <Design.PreviewWith>
-    <Border Margin="20" Width="200">
-      <StackPanel Spacing="10">
-        <Slider Value="50" />
-        <Slider IsEnabled="False" Value="50" />
-      </StackPanel>
+    <Border Margin="20" Width="200" Height="200">
+      <DockPanel LastChildFill="True">
+        <StackPanel Spacing="10" DockPanel.Dock="Top">
+          <Slider Value="50" />
+          <Slider IsEnabled="False" Value="50" />
+        </StackPanel>
+        <StackPanel Spacing="10" Orientation="Horizontal">
+          <Slider Value="50"  Orientation="Vertical" />
+          <Slider IsEnabled="False" Orientation="Vertical" Value="50" />
+        </StackPanel>
+      </DockPanel>
     </Border>
   </Design.PreviewWith>
   <Styles.Resources>

From a00ae36478b3866788e27d891f745c6998b3d3b7 Mon Sep 17 00:00:00 2001
From: Jumar Macato <hikari.netto23@gmail.com>
Date: Fri, 29 May 2020 11:12:58 +0800
Subject: [PATCH 27/45] add vertical style

---
 src/Avalonia.Controls/Slider.cs        |  15 +--
 src/Avalonia.Themes.Fluent/Slider.xaml | 169 ++++++++++++++-----------
 2 files changed, 99 insertions(+), 85 deletions(-)

diff --git a/src/Avalonia.Controls/Slider.cs b/src/Avalonia.Controls/Slider.cs
index 0155ff211a..b218c003c2 100644
--- a/src/Avalonia.Controls/Slider.cs
+++ b/src/Avalonia.Controls/Slider.cs
@@ -97,18 +97,9 @@ namespace Avalonia.Controls
                 _increaseButton.Click -= IncreaseClick;
             }
 
-            // _decreaseButton = e.NameScope.Find<Button>("PART_DecreaseButton");
-
-            if (Orientation == Orientation.Horizontal)
-            {
-                // _track = e.NameScope.Find<Track>("HorizontalThumb");
-            }
-            else
-            {
-                // _track = e.NameScope.Find<Track>("VerticalThumb");
-            }
-
-            // _increaseButton = e.NameScope.Find<Button>("PART_IncreaseButton");
+            _decreaseButton = e.NameScope.Find<Button>("PART_DecreaseButton");
+            _track = e.NameScope.Find<Track>("PART_Track");        
+            _increaseButton = e.NameScope.Find<Button>("PART_IncreaseButton");
 
             if (_decreaseButton != null)
             {
diff --git a/src/Avalonia.Themes.Fluent/Slider.xaml b/src/Avalonia.Themes.Fluent/Slider.xaml
index 13080e6212..75f3e97367 100644
--- a/src/Avalonia.Themes.Fluent/Slider.xaml
+++ b/src/Avalonia.Themes.Fluent/Slider.xaml
@@ -1,4 +1,5 @@
-<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<Styles xmlns="https://github.com/avaloniaui" 
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <Design.PreviewWith>
     <Border Margin="20" Width="200" Height="200">
       <DockPanel LastChildFill="True">
@@ -7,7 +8,7 @@
           <Slider IsEnabled="False" Value="50" />
         </StackPanel>
         <StackPanel Spacing="10" Orientation="Horizontal">
-          <Slider Value="50"  Orientation="Vertical" />
+          <Slider Value="50" Orientation="Vertical" />
           <Slider IsEnabled="False" Orientation="Vertical" Value="50" />
         </StackPanel>
       </DockPanel>
@@ -25,6 +26,18 @@
     <x:Double x:Key="SliderVerticalThumbWidth">20</x:Double>
     <x:Double x:Key="SliderVerticalThumbHeight">20</x:Double>
   </Styles.Resources>
+
+  <Style Selector="Thumb.SliderThumbStyle">
+    <Setter Property="BorderThickness" Value="0" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate>
+          <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{DynamicResource SliderThumbCornerRadius}" />
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+
   <Style Selector="Slider:horizontal">
     <Setter Property="Background" Value="{DynamicResource SliderTrackFill}" />
     <Setter Property="BorderThickness" Value="{DynamicResource SliderBorderThemeThickness}" />
@@ -33,41 +46,11 @@
     <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
     <Setter Property="Template">
       <ControlTemplate>
-        <Border BorderThickness="{TemplateBinding BorderThickness}"
-                BorderBrush="{TemplateBinding BorderBrush}"
-                CornerRadius="{DynamicResource ControlCornerRadius}">
-
+        <Border BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="{DynamicResource ControlCornerRadius}">
           <Grid Name="grid" Margin="{TemplateBinding Padding}" RowDefinitions="Auto, *">
-            <Grid.Styles>
-              <Style Selector="Thumb.SliderThumbStyle">
-                <Setter Property="BorderThickness" Value="0" />
-                <Setter Property="Template">
-                  <Setter.Value>
-                    <ControlTemplate>
-                      <Border Background="{TemplateBinding Background}"
-                              BorderBrush="{TemplateBinding BorderBrush}"
-                              BorderThickness="{TemplateBinding BorderThickness}"
-                              CornerRadius="{DynamicResource SliderThumbCornerRadius}" />
-                    </ControlTemplate>
-                  </Setter.Value>
-                </Setter>
-              </Style>
-            </Grid.Styles>
-            <ContentPresenter x:Name="HeaderContentPresenter"
-                             Grid.Row="0"
-                           
-                             TextBlock.FontWeight="{DynamicResource SliderHeaderThemeFontWeight}"
-                             TextBlock.Foreground="{DynamicResource SliderHeaderForeground}"
-                             Margin="{DynamicResource SliderTopHeaderMargin}" />
-            <Grid x:Name="SliderContainer"
-                              Grid.Row="1">
-              <Grid x:Name="HorizontalTemplate" MinHeight="{DynamicResource SliderHorizontalHeight}">
-
-                <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
+            <ContentPresenter x:Name="HeaderContentPresenter" Grid.Row="0" TextBlock.FontWeight="{DynamicResource SliderHeaderThemeFontWeight}" TextBlock.Foreground="{DynamicResource SliderHeaderForeground}" Margin="{DynamicResource SliderTopHeaderMargin}" />
+            <Grid x:Name="SliderContainer" Grid.Row="1">
+              <Grid x:Name="HorizontalTemplate" ColumnDefinitions="Auto,Auto,*" MinHeight="{DynamicResource SliderHorizontalHeight}">
 
                 <Grid.RowDefinitions>
                   <RowDefinition Height="{DynamicResource SliderPreContentMargin}" />
@@ -76,58 +59,98 @@
                 </Grid.RowDefinitions>
 
                 <!--
-              <TickBar x:Name="TopTickBar"
-                  Visibility="Collapsed"
-                  Fill="{DynamicResource SliderTickBarFill}"
-                  Height="{DynamicResource SliderOutsideTickBarThemeHeight}"
-                  VerticalAlignment="Bottom"
-                  Margin="0,0,0,4"
-                  Grid.ColumnSpan="3" />
-              <TickBar x:Name="HorizontalInlineTickBar"
-                  Visibility="Collapsed"
-                  Fill="{DynamicResource SliderInlineTickBarFill}"
-                  Height="{DynamicResource SliderTrackThemeHeight}"
-                  Grid.Row="1"
-                  Grid.ColumnSpan="3" />
-              <TickBar x:Name="BottomTickBar"
-                  Visibility="Collapsed"
-                  Fill="{DynamicResource SliderTickBarFill}"
-                  Height="{DynamicResource SliderOutsideTickBarThemeHeight}"
-                  VerticalAlignment="Top"
-                  Margin="0,4,0,0"
-                  Grid.Row="2"
-                  Grid.ColumnSpan="3" /> -->
-
-                <Track Name="PART_Track"
-                       Grid.Row="1"
-                       Grid.ColumnSpan="3"
-                       
-                       Orientation="Horizontal">
+                <TickBar x:Name="TopTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderTickBarFill}" Height="{DynamicResource SliderOutsideTickBarThemeHeight}" VerticalAlignment="Bottom" Margin="0,0,0,4" Grid.ColumnSpan="3" />
+                <TickBar x:Name="HorizontalInlineTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderInlineTickBarFill}" Height="{DynamicResource SliderTrackThemeHeight}" Grid.Row="1" Grid.ColumnSpan="3" />
+                <TickBar x:Name="BottomTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderTickBarFill}" Height="{DynamicResource SliderOutsideTickBarThemeHeight}" VerticalAlignment="Top" Margin="0,4,0,0" Grid.Row="2" Grid.ColumnSpan="3" />
+                -->
+
+                <Track Name="PART_Track" Grid.Row="1" Grid.ColumnSpan="3" Orientation="Horizontal">
+                  <Track.DecreaseButton>
+                    <RepeatButton Name="PART_DecreaseButton" Background="{TemplateBinding Foreground}">
+                      <RepeatButton.Template>
+                        <ControlTemplate>
+                          <Grid>
+                            <Border Name="FocusTarget" Background="Transparent" Margin="0,-10"/>
+                            <Border Name="TrackBackground" Background="{TemplateBinding Background}" CornerRadius="{DynamicResource ControlCornerRadius}" Height="{DynamicResource SliderTrackThemeHeight}" VerticalAlignment="Center"/>
+                          </Grid>
+                        </ControlTemplate>
+                      </RepeatButton.Template>
+                    </RepeatButton>
+                  </Track.DecreaseButton>
+                  <Track.IncreaseButton>
+                    <RepeatButton Name="PART_IncreaseButton" Background="{TemplateBinding Background}">
+                      <RepeatButton.Template>
+                        <ControlTemplate>
+                          <Grid>
+                            <Border Name="FocusTarget" Background="Transparent" Margin="0,-10"/>
+                            <Border Name="TrackBackground" Background="{TemplateBinding Background}" CornerRadius="{DynamicResource ControlCornerRadius}" Height="{DynamicResource SliderTrackThemeHeight}" VerticalAlignment="Center"/>
+                          </Grid>
+                        </ControlTemplate>
+                      </RepeatButton.Template>
+                    </RepeatButton>
+                  </Track.IncreaseButton>
+                  <Thumb Classes="SliderThumbStyle" Name="thumb" Margin="0" Padding="0" DataContext="{TemplateBinding Value}" Height="{DynamicResource SliderHorizontalThumbHeight}" Width="{DynamicResource SliderHorizontalThumbWidth}" />
+                </Track>
+              </Grid>
+            </Grid>
+          </Grid>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+  </Style>
+
+  <Style Selector="Slider:vertical">
+    <Setter Property="Background" Value="{DynamicResource SliderTrackFill}" />
+    <Setter Property="BorderThickness" Value="{DynamicResource SliderBorderThemeThickness}" />
+    <Setter Property="Foreground" Value="{DynamicResource SliderTrackValueFill}" />
+    <Setter Property="FontFamily" Value="{DynamicResource ContentControlThemeFontFamily}" />
+    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="{DynamicResource ControlCornerRadius}">
+          <Grid Name="grid" Margin="{TemplateBinding Padding}" RowDefinitions="Auto, *">
+            <ContentPresenter x:Name="HeaderContentPresenter" Grid.Row="0" TextBlock.FontWeight="{DynamicResource SliderHeaderThemeFontWeight}" TextBlock.Foreground="{DynamicResource SliderHeaderForeground}" Margin="{DynamicResource SliderTopHeaderMargin}" />
+            <Grid x:Name="SliderContainer" Grid.Row="1">
+              <Grid x:Name="VerticalTemplate" RowDefinitions="*,Auto,Auto" MinWidth="{DynamicResource SliderVerticalWidth}">
+
+                <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="{DynamicResource SliderPreContentMargin}" />
+                  <ColumnDefinition Width="Auto" />
+                  <ColumnDefinition Width="{DynamicResource SliderPostContentMargin}" />
+                </Grid.ColumnDefinitions>
+
+                <!-- 
+                <TickBar x:Name="LeftTickBar" Visibility="Collapsed" Fill="{ThemeResource SliderTickBarFill}" Width="{ThemeResource SliderOutsideTickBarThemeHeight}" HorizontalAlignment="Right" Margin="0,0,4,0" Grid.RowSpan="3" />
+                <TickBar x:Name="VerticalInlineTickBar" Visibility="Collapsed" Fill="{ThemeResource SliderInlineTickBarFill}" Width="{ThemeResource SliderTrackThemeHeight}" Grid.Column="1" Grid.RowSpan="3" />
+                <TickBar x:Name="RightTickBar" Visibility="Collapsed" Fill="{ThemeResource SliderTickBarFill}" Width="{ThemeResource SliderOutsideTickBarThemeHeight}" HorizontalAlignment="Left" Margin="4,0,0,0" Grid.Column="2" Grid.RowSpan="3" /> 
+                -->
+
+                <Track Name="PART_Track" Grid.Column="1" Grid.ColumnSpan="1" Grid.RowSpan="3" Orientation="Vertical">
                   <Track.DecreaseButton>
                     <RepeatButton Name="PART_DecreaseButton" Background="{TemplateBinding Foreground}">
                       <RepeatButton.Template>
                         <ControlTemplate>
-                          <Border Name="TrackBackground" Background="{TemplateBinding Background}" CornerRadius="{DynamicResource ControlCornerRadius}" Height="{DynamicResource SliderTrackThemeHeight}" VerticalAlignment="Center"/>
+                          <Grid>
+                            <Border Name="FocusTarget" Background="Transparent" Margin="0,-10"/>
+                            <Border Name="TrackBackground" Background="{TemplateBinding Background}" CornerRadius="{DynamicResource ControlCornerRadius}" Width="{DynamicResource SliderTrackThemeHeight}" HorizontalAlignment="Center"/>
+                          </Grid>
                         </ControlTemplate>
                       </RepeatButton.Template>
                     </RepeatButton>
                   </Track.DecreaseButton>
                   <Track.IncreaseButton>
-                    <RepeatButton Name="PART_IncreaseButton" Margin="0" Padding="0" Background="{TemplateBinding Background}"
-                                  Classes="repeattrack">
+                    <RepeatButton Name="PART_IncreaseButton" Background="{TemplateBinding Background}">
                       <RepeatButton.Template>
                         <ControlTemplate>
-                          <Border Name="TrackBackground" Background="{TemplateBinding Background}" CornerRadius="{DynamicResource ControlCornerRadius}" Height="{DynamicResource SliderTrackThemeHeight}" VerticalAlignment="Center"/>
+                          <Grid>
+                            <Border Name="FocusTarget" Background="Transparent" Margin="0,-10"/>
+                            <Border Name="TrackBackground" Background="{TemplateBinding Background}" CornerRadius="{DynamicResource ControlCornerRadius}" Width="{DynamicResource SliderTrackThemeHeight}" HorizontalAlignment="Center"/>
+                          </Grid>
                         </ControlTemplate>
                       </RepeatButton.Template>
                     </RepeatButton>
                   </Track.IncreaseButton>
-                  <Thumb Classes="SliderThumbStyle"
-                         Name="thumb"
-                         Margin="0" Padding="0"
-                         DataContext="{TemplateBinding Value}"
-                         Height="{DynamicResource SliderHorizontalThumbHeight}"
-                         Width="{DynamicResource SliderHorizontalThumbWidth}" />
+                  <Thumb Classes="SliderThumbStyle" Name="thumb" Margin="0" Padding="0" DataContext="{TemplateBinding Value}" Height="{DynamicResource SliderVerticalThumbHeight}" Width="{DynamicResource SliderVerticalThumbWidth}" />
                 </Track>
               </Grid>
             </Grid>

From f03a6e0e5a7c99b8160ed8fb4e676722b46054db Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Fri, 29 May 2020 15:06:00 -0300
Subject: [PATCH 28/45] user PressedMixin for slider.

---
 src/Avalonia.Controls/Slider.cs | 26 +++-----------------------
 1 file changed, 3 insertions(+), 23 deletions(-)

diff --git a/src/Avalonia.Controls/Slider.cs b/src/Avalonia.Controls/Slider.cs
index b218c003c2..d6e28d8ccf 100644
--- a/src/Avalonia.Controls/Slider.cs
+++ b/src/Avalonia.Controls/Slider.cs
@@ -1,6 +1,6 @@
 using System;
+using Avalonia.Controls.Mixins;
 using Avalonia.Controls.Primitives;
-using Avalonia.Data;
 using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.Layout;
@@ -40,13 +40,11 @@ namespace Avalonia.Controls
         /// </summary>
         static Slider()
         {
+            PressedMixin.Attach<Slider>();
             OrientationProperty.OverrideDefaultValue(typeof(Slider), Orientation.Horizontal);
             Thumb.DragStartedEvent.AddClassHandler<Slider>((x, e) => x.OnThumbDragStarted(e), RoutingStrategies.Bubble);
             Thumb.DragDeltaEvent.AddClassHandler<Slider>((x, e) => x.OnThumbDragDelta(e), RoutingStrategies.Bubble);
-            Thumb.DragCompletedEvent.AddClassHandler<Slider>((x, e) => x.OnThumbDragCompleted(e), RoutingStrategies.Bubble);
-            PointerPressedEvent.AddClassHandler<Slider>((x, e) => x.HandlePointerPressed(e), RoutingStrategies.Tunnel, true);
-            PointerReleasedEvent.AddClassHandler<Slider>((x, e) => x.HandlePointerReleased(), RoutingStrategies.Tunnel, true);
-            PointerCaptureLostEvent.AddClassHandler<Slider>((x, e) => x.HandlePointerReleased(), RoutingStrategies.Tunnel, true);
+            Thumb.DragCompletedEvent.AddClassHandler<Slider>((x, e) => x.OnThumbDragCompleted(e), RoutingStrategies.Bubble);            
         }
 
         /// <summary>
@@ -201,24 +199,6 @@ namespace Avalonia.Controls
             return value;
         }
 
-        private void HandlePointerPressed(PointerPressedEventArgs e)
-        {
-            if (e.GetCurrentPoint(this).Properties.IsLeftButtonPressed)
-            {
-                UpdatePseudoClasses(true);
-            }
-        }
-
-        private void HandlePointerReleased()
-        {
-            UpdatePseudoClasses(false);
-        }
-
-        private void UpdatePseudoClasses(bool isPressed)
-        {
-            PseudoClasses.Set(":pressed", isPressed);
-        }
-
         private void UpdatePseudoClasses(Orientation o)
         {
             PseudoClasses.Set(":vertical", o == Orientation.Vertical);

From 2fa6f6c0d69d85eddfc706901457fb3ac01cc5b0 Mon Sep 17 00:00:00 2001
From: Jumar Macato <hikari.netto23@gmail.com>
Date: Sat, 30 May 2020 18:59:58 +0800
Subject: [PATCH 29/45] Port TickBar from WPF

---
 src/Avalonia.Controls/TickBar.cs       | 593 +++++++++++++++++++++++++
 src/Avalonia.Themes.Fluent/Slider.xaml |  34 +-
 2 files changed, 610 insertions(+), 17 deletions(-)
 create mode 100644 src/Avalonia.Controls/TickBar.cs

diff --git a/src/Avalonia.Controls/TickBar.cs b/src/Avalonia.Controls/TickBar.cs
new file mode 100644
index 0000000000..1cf98bd169
--- /dev/null
+++ b/src/Avalonia.Controls/TickBar.cs
@@ -0,0 +1,593 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Controls.Primitives;
+using Avalonia.Data;
+using Avalonia.Layout;
+using Avalonia.Media;
+using Avalonia.Utilities;
+
+namespace Avalonia.Controls
+{
+
+    /// <summary>
+    /// Enum which describes how to position the TickBar.
+    /// </summary>
+    public enum TickBarPlacement
+    {
+        /// <summary>
+        /// Position this tick at the left of target element.
+        /// </summary>
+        Left,
+
+        /// <summary>
+        /// Position this tick at the top of target element.
+        /// </summary>
+        Top,
+
+        /// <summary>
+        /// Position this tick at the right of target element.
+        /// </summary>
+        Right,
+
+        /// <summary>
+        /// Position this tick at the bottom of target element.
+        /// </summary>
+        Bottom,
+
+        // NOTE: if you add or remove any values in this enum, be sure to update TickBar.IsValidTickBarPlacement()
+    };
+
+
+    /// <summary>
+    /// TickBar is an element that use for drawing Slider's Ticks.
+    /// </summary>
+    public class TickBar : TemplatedControl
+    {
+        static TickBar()
+        {
+            AffectsRender<TickBar>(ReservedSpaceProperty, MaximumProperty, MinimumProperty, OrientationProperty, TickFrequencyProperty);
+        }
+
+        public TickBar() : base()
+        {
+        }
+
+        /// <summary>
+        /// Defines the <see cref="Fill"/> property.
+        /// </summary>
+        public static readonly StyledProperty<IBrush> FillProperty =
+            AvaloniaProperty.Register<TickBar, IBrush>(nameof(Fill));
+
+        /// <summary>
+        /// Brush used to fill the TickBar's Ticks.
+        /// </summary>
+        public IBrush Fill
+        {
+            get { return GetValue(FillProperty); }
+            set { SetValue(FillProperty, value); }
+        }
+
+        /// <summary>
+        /// Defines the <see cref="Minimum"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> MinimumProperty =
+            AvaloniaProperty.Register<TickBar, double>(nameof(Minimum), 0d);
+
+        /// <summary>
+        /// Logical position where the Minimum Tick will be drawn
+        /// </summary>
+        public double Minimum
+        {
+            get { return GetValue(MinimumProperty); }
+            set { SetValue(MinimumProperty, value); }
+        }
+
+
+        /// <summary>
+        /// Defines the <see cref="Maximum"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> MaximumProperty =
+            AvaloniaProperty.Register<TickBar, double>(nameof(Maximum), 0d);
+
+        /// <summary>
+        /// Logical position where the Maximum Tick will be drawn
+        /// </summary>
+        public double Maximum
+        {
+            get { return GetValue(MaximumProperty); }
+            set { SetValue(MaximumProperty, value); }
+        }
+
+/*
+        /// <summary>
+        /// Defines the <see cref="SelectionStart"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> SelectionStartProperty =
+            AvaloniaProperty.Register<TickBar, double>(nameof(SelectionStart), 0d);
+
+        /// <summary>
+        /// Logical position where the SelectionStart Tick will be drawn
+        /// </summary>
+        public double SelectionStart
+        {
+            get { return GetValue(SelectionStartProperty); }
+            set { SetValue(SelectionStartProperty, value); }
+        }
+
+        /// <summary>
+        /// Defines the <see cref="SelectionEnd"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> SelectionEndProperty =
+            AvaloniaProperty.Register<TickBar, double>(nameof(SelectionEnd), 0d);
+
+        /// <summary>
+        /// Logical position where the SelectionEnd Tick will be drawn
+        /// </summary>
+        public double SelectionEnd
+        {
+            get { return GetValue(SelectionEndProperty); }
+            set { SetValue(SelectionEndProperty, value); }
+        }
+
+        /// <summary>
+        /// Defines the <see cref="IsSelectionRangeEnabled"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> IsSelectionRangeEnabledProperty =
+            AvaloniaProperty.Register<TickBar, bool>(nameof(IsSelectionRangeEnabled));
+
+        /// <summary>
+        /// IsSelectionRangeEnabled specifies whether to draw SelectionStart Tick and SelectionEnd Tick or not.
+        /// </summary>
+        public bool IsSelectionRangeEnabled
+        {
+            get { return GetValue(IsSelectionRangeEnabledProperty); }
+            set { SetValue(IsSelectionRangeEnabledProperty, value); }
+        }
+*/
+
+        /// <summary>
+        /// Defines the <see cref="TickFrequency"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> TickFrequencyProperty =
+            AvaloniaProperty.Register<TickBar, double>(nameof(TickFrequency), 0d);
+
+        /// <summary>
+        /// TickFrequency property defines how the tick will be drawn.
+        /// </summary>
+        public double TickFrequency
+        {
+            get { return GetValue(TickFrequencyProperty); }
+            set { SetValue(TickFrequencyProperty, value); }
+        }
+
+        /// <summary>
+        /// Defines the <see cref="Orientation"/> property.
+        /// </summary>
+        public static readonly StyledProperty<Orientation> OrientationProperty =
+            AvaloniaProperty.Register<TickBar, Orientation>(nameof(Orientation));
+
+        /// <summary>
+        /// TickBar parent's orientation.
+        /// </summary>
+        public Orientation Orientation
+        {
+            get { return GetValue(OrientationProperty); }
+            set { SetValue(OrientationProperty, value); }
+        }
+
+        /// <summary>
+        /// Defines the <see cref="Ticks"/> property.
+        /// </summary>
+        public static readonly StyledProperty<List<double>> TicksProperty =
+            AvaloniaProperty.Register<TickBar, List<double>>(nameof(Ticks));
+
+        /// <summary>
+        /// The Ticks property contains collection of value of type Double which
+        /// are the logical positions use to draw the ticks.
+        /// The property value is a <see cref="DoubleCollection" />.
+        /// </summary>
+        public List<double> Ticks
+        {
+            get { return GetValue(TicksProperty); }
+            set { SetValue(TicksProperty, value); }
+        }
+
+        /// <summary>
+        /// Defines the <see cref="IsDirectionReversed"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> IsDirectionReversedProperty =
+            AvaloniaProperty.Register<TickBar, bool>(nameof(IsDirectionReversed), false);
+
+        /// <summary>
+        /// The IsDirectionReversed property defines the direction of value incrementation.
+        /// By default, if Tick's orientation is Horizontal, ticks will be drawn from left to right.
+        /// (And, bottom to top for Vertical orientation).
+        /// If IsDirectionReversed is 'true' the direction of the drawing will be in opposite direction.
+        /// </summary>
+        public bool IsDirectionReversed
+        {
+            get { return GetValue(IsDirectionReversedProperty); }
+            set { SetValue(IsDirectionReversedProperty, value); }
+        }
+
+        /// <summary>
+        /// Defines the <see cref="Placement"/> property.
+        /// </summary>
+        public static readonly StyledProperty<TickBarPlacement> PlacementProperty =
+            AvaloniaProperty.Register<TickBar, TickBarPlacement>(nameof(Placement), 0d);
+
+
+        /// <summary>
+        /// Placement property specified how the Tick will be placed.
+        /// This property affects the way ticks are drawn.
+        /// This property has type of <see cref="TickBarPlacement" />.
+        /// </summary>
+        public TickBarPlacement Placement
+        {
+            get { return GetValue(PlacementProperty); }
+            set { SetValue(PlacementProperty, value); }
+        }
+
+        private static bool IsValidTickBarPlacement(object o)
+        {
+            TickBarPlacement placement = (TickBarPlacement)o;
+            return placement == TickBarPlacement.Left ||
+                   placement == TickBarPlacement.Top ||
+                   placement == TickBarPlacement.Right ||
+                   placement == TickBarPlacement.Bottom;
+        }
+
+        /// <summary>
+        /// Defines the <see cref="ReservedSpace"/> property.
+        /// </summary>
+        public static readonly StyledProperty<Rect> ReservedSpaceProperty =
+            AvaloniaProperty.Register<TickBar, Rect>(nameof(ReservedSpace));
+
+        /// <summary>
+        /// TickBar will use ReservedSpaceProperty for left and right spacing (for horizontal orientation) or
+        /// tob and bottom spacing (for vertical orienation).
+        /// The space on both sides of TickBar is half of specified ReservedSpace.
+        /// This property has type of <see cref="Rect" />.
+        /// </summary>
+        public Rect ReservedSpace
+        {
+            get { return GetValue(ReservedSpaceProperty); }
+            set { SetValue(ReservedSpaceProperty, value); }
+        }
+
+
+        /// <summary>
+        /// Draw ticks.
+        /// Ticks can be draw in 8 diffrent ways depends on Placment property and IsDirectionReversed property.
+        ///
+        /// This function also draw selection-tick(s) if IsSelectionRangeEnabled is 'true' and
+        /// SelectionStart and SelectionEnd are valid.
+        ///
+        /// The primary ticks (for Mininum and Maximum value) height will be 100% of TickBar's render size (use Width or Height
+        /// depends on Placement property).
+        ///
+        /// The secondary ticks (all other ticks, including selection-tics) height will be 75% of TickBar's render size.
+        ///
+        /// Brush that use to fill ticks is specified by Shape.Fill property.
+        ///
+        /// Pen that use to draw ticks is specified by Shape.Pen property.
+        /// </summary>
+        public override void Render(DrawingContext dc)
+        {
+            var size = new Size(Bounds.Width, Bounds.Height);
+            var range = Maximum - Minimum;
+            var tickLen = 0.0d;   // Height for Primary Tick (for Mininum and Maximum value)
+            var tickLen2 = 0.0d;  // Height for Secondary Tick
+            var logicalToPhysical = 1.0;
+            var progression = 1.0d;
+            var startPoint = new Point();
+            var endPoint = new Point();
+            var rSpace = Orientation == Orientation.Horizontal ? ReservedSpace.Width : ReservedSpace.Height;
+
+            // Take Thumb size in to account
+            double halfReservedSpace = rSpace * 0.5;
+
+            switch (Placement)
+            {
+                case TickBarPlacement.Top:
+                    if (MathUtilities.GreaterThanOrClose(rSpace, size.Width))
+                    {
+                        return;
+                    }
+                    size = new Size(size.Width - rSpace, size.Height);
+                    tickLen = -size.Height;
+                    startPoint = new Point(halfReservedSpace, size.Height);
+                    endPoint = new Point(halfReservedSpace + size.Width, size.Height);
+                    logicalToPhysical = size.Width / range;
+                    progression = 1;
+                    break;
+
+                case TickBarPlacement.Bottom:
+                    if (MathUtilities.GreaterThanOrClose(rSpace, size.Width))
+                    {
+                        return;
+                    }
+                    size = new Size(size.Width - rSpace, size.Height);
+                    tickLen = size.Height;
+                    startPoint = new Point(halfReservedSpace, 0d);
+                    endPoint = new Point(halfReservedSpace + size.Width, 0d);
+                    logicalToPhysical = size.Width / range;
+                    progression = 1;
+                    break;
+
+                case TickBarPlacement.Left:
+                    if (MathUtilities.GreaterThanOrClose(rSpace, size.Height))
+                    {
+                        return;
+                    }
+                    size = new Size(size.Width, size.Height - rSpace);
+
+                    tickLen = -size.Width;
+                    startPoint = new Point(size.Width, size.Height + halfReservedSpace);
+                    endPoint = new Point(size.Width, halfReservedSpace);
+                    logicalToPhysical = size.Height / range * -1;
+                    progression = -1;
+                    break;
+
+                case TickBarPlacement.Right:
+                    if (MathUtilities.GreaterThanOrClose(rSpace, size.Height))
+                    {
+                        return;
+                    }
+
+                    size = new Size(size.Width, size.Height - rSpace);
+
+                    tickLen = size.Width;
+                    startPoint = new Point(0d, size.Height + halfReservedSpace);
+                    endPoint = new Point(0d, halfReservedSpace);
+                    logicalToPhysical = size.Height / range * -1;
+                    progression = -1;
+                    break;
+            };
+
+            tickLen2 = tickLen * 0.75;
+
+            // Invert direciton of the ticks
+            if (IsDirectionReversed)
+            {
+                progression *= -progression;
+                logicalToPhysical *= -1;
+
+                // swap startPoint & endPoint
+                var pt = startPoint;
+                startPoint = endPoint;
+                endPoint = pt;
+            }
+
+            var pen = new Pen(Fill, 1.0d);
+            bool snapsToDevicePixels = UseLayoutRounding;
+            // var xLines = snapsToDevicePixels ? new List<double>() : null;
+            // var yLines = snapsToDevicePixels ? new List<double>() : null;
+
+            // Is it Vertical?
+            if ((Placement == TickBarPlacement.Left) || (Placement == TickBarPlacement.Right))
+            {
+                // Reduce tick interval if it is more than would be visible on the screen
+                double interval = TickFrequency;
+                if (interval > 0.0)
+                {
+                    double minInterval = (Maximum - Minimum) / size.Height;
+                    if (interval < minInterval)
+                    {
+                        interval = minInterval;
+                    }
+                }
+
+                // Draw Min & Max tick
+                dc.DrawLine(pen, startPoint, new Point(startPoint.X + tickLen, startPoint.Y));
+                dc.DrawLine(pen, new Point(startPoint.X, endPoint.Y),
+                                 new Point(startPoint.X + tickLen, endPoint.Y));
+
+                // if (snapsToDevicePixels)
+                // {
+                //     xLines.Add(startPoint.X);
+                //     yLines.Add(startPoint.Y - 0.5);
+                //     xLines.Add(startPoint.X + tickLen);
+                //     yLines.Add(endPoint.Y - 0.5);
+                //     xLines.Add(startPoint.X + tickLen2);
+                // }
+
+                // This property is rarely set so let's try to avoid the GetValue
+                // caching of the mutable default value
+                var ticks = Ticks ?? null;
+
+                // Draw ticks using specified Ticks collection
+                if (ticks?.Count > 0)
+                {
+                    for (int i = 0; i < ticks.Count; i++)
+                    {
+                        if (MathUtilities.LessThanOrClose(ticks[i],Minimum) || MathUtilities.GreaterThanOrClose(ticks[i],Maximum))
+                        {
+                            continue;
+                        }
+
+                        double adjustedTick = ticks[i] - Minimum;
+
+                        double y = adjustedTick * logicalToPhysical + startPoint.Y;
+                        dc.DrawLine(pen,
+                            new Point(startPoint.X, y),
+                            new Point(startPoint.X + tickLen2, y));
+
+                        // if (snapsToDevicePixels)
+                        // {
+                        //     yLines.Add(y - 0.5);
+                        // }
+                    }
+                }
+                // Draw ticks using specified TickFrequency
+                else if (interval > 0.0)
+                {
+                    for (double i = interval; i < range; i += interval)
+                    {
+                        double y = i * logicalToPhysical + startPoint.Y;
+
+                        dc.DrawLine(pen,
+                            new Point(startPoint.X, y),
+                            new Point(startPoint.X + tickLen2, y));
+
+                        // if (snapsToDevicePixels)
+                        // {
+                        //     yLines.Add(y - 0.5);
+                        // }
+                    }
+                }
+
+                // Draw Selection Ticks
+                // if (IsSelectionRangeEnabled)
+                // {
+                    // double y0 = (SelectionStart - Minimum) * logicalToPhysical + startPoint.Y;
+                    // Point pt0 = new Point(startPoint.X, y0);
+                    // Point pt1 = new Point(startPoint.X + tickLen2, y0);
+                    // Point pt2 = new Point(startPoint.X + tickLen2, y0 + Math.Abs(tickLen2) * progression);
+
+                    // PathSegment[] segments = new PathSegment[] {
+                    //     new LineSegment(pt2, true),
+                    //     new LineSegment(pt0, true),
+                    // };
+                    // PathGeometry geo = new PathGeometry(new PathFigure[] { new PathFigure(pt1, segments, true) });
+
+                    // dc.DrawGeometry(Fill, pen, geo);
+
+                    // y0 = (SelectionEnd - Minimum) * logicalToPhysical + startPoint.Y;
+                    // pt0 = new Point(startPoint.X, y0);
+                    // pt1 = new Point(startPoint.X + tickLen2, y0);
+                    // pt2 = new Point(startPoint.X + tickLen2, y0 - Math.Abs(tickLen2) * progression);
+
+                    // segments = new PathSegment[] {
+                    //     new LineSegment(pt2, true),
+                    //     new LineSegment(pt0, true),
+                    // };
+                    // geo = new PathGeometry(new PathFigure[] { new PathFigure(pt1, segments, true) });
+                    // dc.DrawGeometry(Fill, pen, geo);
+                // }
+            }
+            else  // Placement == Top || Placement == Bottom
+            {
+                // Reduce tick interval if it is more than would be visible on the screen
+                double interval = TickFrequency;
+                if (interval > 0.0)
+                {
+                    double minInterval = (Maximum - Minimum) / size.Width;
+                    if (interval < minInterval)
+                    {
+                        interval = minInterval;
+                    }
+                }
+
+                // Draw Min & Max tick
+                dc.DrawLine(pen, startPoint, new Point(startPoint.X, startPoint.Y + tickLen));
+                dc.DrawLine(pen, new Point(endPoint.X, startPoint.Y),
+                                 new Point(endPoint.X, startPoint.Y + tickLen));
+
+                // if (snapsToDevicePixels)
+                // {
+                //     xLines.Add(startPoint.X - 0.5);
+                //     yLines.Add(startPoint.Y);
+                //     xLines.Add(startPoint.X - 0.5);
+                //     yLines.Add(endPoint.Y + tickLen);
+                //     yLines.Add(endPoint.Y + tickLen2);
+                // }
+
+                // This property is rarely set so let's try to avoid the GetValue
+                // caching of the mutable default value
+                var ticks = Ticks ?? null;
+
+                // Draw ticks using specified Ticks collection
+                if (ticks?.Count > 0)
+                {
+                    for (int i = 0; i < ticks.Count; i++)
+                    {
+                        if (MathUtilities.LessThanOrClose(ticks[i],Minimum) || MathUtilities.GreaterThanOrClose(ticks[i],Maximum))
+                        {
+                            continue;
+                        }
+                        double adjustedTick = ticks[i] - Minimum;
+
+                        double x = adjustedTick * logicalToPhysical + startPoint.X;
+                        dc.DrawLine(pen,
+                            new Point(x, startPoint.Y),
+                            new Point(x, startPoint.Y + tickLen2));
+
+                        // if (snapsToDevicePixels)
+                        // {
+                        //     xLines.Add(x - 0.5);
+                        // }
+                    }
+                }
+                // Draw ticks using specified TickFrequency
+                else if (interval > 0.0)
+                {
+                    for (double i = interval; i < range; i += interval)
+                    {
+                        double x = i * logicalToPhysical + startPoint.X;
+                        dc.DrawLine(pen,
+                            new Point(x, startPoint.Y),
+                            new Point(x, startPoint.Y + tickLen2));
+
+                        // if (snapsToDevicePixels)
+                        // {
+                        //     xLines.Add(x - 0.5);
+                        // }
+                    }
+                }
+
+                // Draw Selection Ticks
+                // if (IsSelectionRangeEnabled)
+                // {
+                //     double x0 = (SelectionStart - Minimum) * logicalToPhysical + startPoint.X;
+                //     Point pt0 = new Point(x0, startPoint.Y);
+                //     Point pt1 = new Point(x0, startPoint.Y + tickLen2);
+                //     Point pt2 = new Point(x0 + Math.Abs(tickLen2) * progression, startPoint.Y + tickLen2);
+
+                //     PathSegment[] segments = new PathSegment[] {
+                //         new LineSegment(pt2, true),
+                //         new LineSegment(pt0, true),
+                //     };
+                //     PathGeometry geo = new PathGeometry(new PathFigure[] { new PathFigure(pt1, segments, true) });
+
+                //     dc.DrawGeometry(Fill, pen, geo);
+
+                //     x0 = (SelectionEnd - Minimum) * logicalToPhysical + startPoint.X;
+                //     pt0 = new Point(x0, startPoint.Y);
+                //     pt1 = new Point(x0, startPoint.Y + tickLen2);
+                //     pt2 = new Point(x0 - Math.Abs(tickLen2) * progression, startPoint.Y + tickLen2);
+
+                //     segments = new PathSegment[] {
+                //         new LineSegment(pt2, true),
+                //         new LineSegment(pt0, true),
+                //     };
+                //     geo = new PathGeometry(new PathFigure[] { new PathFigure(pt1, segments, true) });
+                //     dc.DrawGeometry(Fill, pen, geo);
+                // }
+            }
+
+            // if (snapsToDevicePixels)
+            // {
+            //     xLines.Add(Bounds.Width);
+            //     yLines.Add(Bounds.Height);
+            //     VisualXSnappingGuidelines = xLines;
+            //     VisualYSnappingGuidelines = yLines;
+            // }
+        }
+        protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
+        {
+            if (TemplatedParent is Slider parent)
+            {
+                this[~TickFrequencyProperty] = parent[~Slider.TickFrequencyProperty];
+                this[~OrientationProperty] = parent[~Slider.OrientationProperty];
+                this[~MinimumProperty] = parent[~Slider.MinimumProperty];
+                this[~MaximumProperty] = parent[~Slider.MaximumProperty];
+
+                // if (parent._track != null)
+                // {
+                ReservedSpace = new Rect(0, 0, 20, 20); // HACK parent._track.Thumb[~BoundsProperty];
+                // }
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Themes.Fluent/Slider.xaml b/src/Avalonia.Themes.Fluent/Slider.xaml
index 75f3e97367..fff8525ebd 100644
--- a/src/Avalonia.Themes.Fluent/Slider.xaml
+++ b/src/Avalonia.Themes.Fluent/Slider.xaml
@@ -48,9 +48,9 @@
       <ControlTemplate>
         <Border BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="{DynamicResource ControlCornerRadius}">
           <Grid Name="grid" Margin="{TemplateBinding Padding}" RowDefinitions="Auto, *">
-            <ContentPresenter x:Name="HeaderContentPresenter" Grid.Row="0" TextBlock.FontWeight="{DynamicResource SliderHeaderThemeFontWeight}" TextBlock.Foreground="{DynamicResource SliderHeaderForeground}" Margin="{DynamicResource SliderTopHeaderMargin}" />
-            <Grid x:Name="SliderContainer" Grid.Row="1">
-              <Grid x:Name="HorizontalTemplate" ColumnDefinitions="Auto,Auto,*" MinHeight="{DynamicResource SliderHorizontalHeight}">
+            <ContentPresenter Name="HeaderContentPresenter" Grid.Row="0" TextBlock.FontWeight="{DynamicResource SliderHeaderThemeFontWeight}" TextBlock.Foreground="{DynamicResource SliderHeaderForeground}" Margin="{DynamicResource SliderTopHeaderMargin}" />
+            <Grid Name="SliderContainer" Grid.Row="1">
+              <Grid Name="HorizontalTemplate" ColumnDefinitions="Auto,Auto,*" MinHeight="{DynamicResource SliderHorizontalHeight}">
 
                 <Grid.RowDefinitions>
                   <RowDefinition Height="{DynamicResource SliderPreContentMargin}" />
@@ -58,11 +58,11 @@
                   <RowDefinition Height="{DynamicResource SliderPostContentMargin}" />
                 </Grid.RowDefinitions>
 
-                <!--
-                <TickBar x:Name="TopTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderTickBarFill}" Height="{DynamicResource SliderOutsideTickBarThemeHeight}" VerticalAlignment="Bottom" Margin="0,0,0,4" Grid.ColumnSpan="3" />
-                <TickBar x:Name="HorizontalInlineTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderInlineTickBarFill}" Height="{DynamicResource SliderTrackThemeHeight}" Grid.Row="1" Grid.ColumnSpan="3" />
-                <TickBar x:Name="BottomTickBar" Visibility="Collapsed" Fill="{DynamicResource SliderTickBarFill}" Height="{DynamicResource SliderOutsideTickBarThemeHeight}" VerticalAlignment="Top" Margin="0,4,0,0" Grid.Row="2" Grid.ColumnSpan="3" />
-                -->
+                <TickBar Name="TopTickBar" Placement="Top" Fill="{DynamicResource SliderTickBarFill}" Height="{DynamicResource SliderOutsideTickBarThemeHeight}" VerticalAlignment="Bottom" Margin="0,0,0,4" Grid.ColumnSpan="3" />
+                
+                <TickBar Name="HorizontalInlineTickBar" Placement="Top" Fill="{DynamicResource SliderInlineTickBarFill}" Height="{DynamicResource SliderTrackThemeHeight}" Grid.Row="1" Grid.ColumnSpan="3" />
+                
+                <TickBar Name="BottomTickBar" Placement="Bottom" Fill="{DynamicResource SliderTickBarFill}" Height="{DynamicResource SliderOutsideTickBarThemeHeight}" VerticalAlignment="Top" Margin="0,4,0,0" Grid.Row="2" Grid.ColumnSpan="3" />
 
                 <Track Name="PART_Track" Grid.Row="1" Grid.ColumnSpan="3" Orientation="Horizontal">
                   <Track.DecreaseButton>
@@ -109,22 +109,22 @@
       <ControlTemplate>
         <Border BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="{DynamicResource ControlCornerRadius}">
           <Grid Name="grid" Margin="{TemplateBinding Padding}" RowDefinitions="Auto, *">
-            <ContentPresenter x:Name="HeaderContentPresenter" Grid.Row="0" TextBlock.FontWeight="{DynamicResource SliderHeaderThemeFontWeight}" TextBlock.Foreground="{DynamicResource SliderHeaderForeground}" Margin="{DynamicResource SliderTopHeaderMargin}" />
-            <Grid x:Name="SliderContainer" Grid.Row="1">
-              <Grid x:Name="VerticalTemplate" RowDefinitions="*,Auto,Auto" MinWidth="{DynamicResource SliderVerticalWidth}">
+            <ContentPresenter Name="HeaderContentPresenter" Grid.Row="0" TextBlock.FontWeight="{DynamicResource SliderHeaderThemeFontWeight}" TextBlock.Foreground="{DynamicResource SliderHeaderForeground}" Margin="{DynamicResource SliderTopHeaderMargin}" />
+            <Grid Name="SliderContainer" Grid.Row="1">
+              <Grid Name="VerticalTemplate" RowDefinitions="*,Auto,Auto" MinWidth="{DynamicResource SliderVerticalWidth}">
 
                 <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="{DynamicResource SliderPreContentMargin}" />
                   <ColumnDefinition Width="Auto" />
                   <ColumnDefinition Width="{DynamicResource SliderPostContentMargin}" />
                 </Grid.ColumnDefinitions>
+ 
+                <TickBar Name="LeftTickBar" Placement="Left" Fill="{DynamicResource SliderTickBarFill}" Width="{DynamicResource SliderOutsideTickBarThemeHeight}" HorizontalAlignment="Right" Margin="0,0,4,0" Grid.RowSpan="3" />
+                
+                <TickBar Name="VerticalInlineTickBar" Placement="Left" Fill="{DynamicResource SliderInlineTickBarFill}" Width="{DynamicResource SliderTrackThemeHeight}" Grid.Column="1" Grid.RowSpan="3" />
 
-                <!-- 
-                <TickBar x:Name="LeftTickBar" Visibility="Collapsed" Fill="{ThemeResource SliderTickBarFill}" Width="{ThemeResource SliderOutsideTickBarThemeHeight}" HorizontalAlignment="Right" Margin="0,0,4,0" Grid.RowSpan="3" />
-                <TickBar x:Name="VerticalInlineTickBar" Visibility="Collapsed" Fill="{ThemeResource SliderInlineTickBarFill}" Width="{ThemeResource SliderTrackThemeHeight}" Grid.Column="1" Grid.RowSpan="3" />
-                <TickBar x:Name="RightTickBar" Visibility="Collapsed" Fill="{ThemeResource SliderTickBarFill}" Width="{ThemeResource SliderOutsideTickBarThemeHeight}" HorizontalAlignment="Left" Margin="4,0,0,0" Grid.Column="2" Grid.RowSpan="3" /> 
-                -->
-
+                <TickBar Name="RightTickBar" Placement="Right" Fill="{DynamicResource SliderTickBarFill}" Width="{DynamicResource SliderOutsideTickBarThemeHeight}" HorizontalAlignment="Left" Margin="4,0,0,0" Grid.Column="2" Grid.RowSpan="3" /> 
+                
                 <Track Name="PART_Track" Grid.Column="1" Grid.ColumnSpan="1" Grid.RowSpan="3" Orientation="Vertical">
                   <Track.DecreaseButton>
                     <RepeatButton Name="PART_DecreaseButton" Background="{TemplateBinding Foreground}">

From cf7a9122b45d0b8d395948426808f8cc7b6a1a8d Mon Sep 17 00:00:00 2001
From: Jumar Macato <hikari.netto23@gmail.com>
Date: Sat, 30 May 2020 19:06:14 +0800
Subject: [PATCH 30/45] Fix merge conflicts

---
 src/Avalonia.Controls/ListBoxItem.cs          |  30 +--
 src/Avalonia.Controls/Mixins/PressedMixin.cs  |  37 ++++
 src/Avalonia.Controls/Platform/IPopupImpl.cs  |   2 +
 src/Avalonia.Controls/Primitives/Popup.cs     |  21 +-
 src/Avalonia.Controls/Primitives/PopupRoot.cs |   6 +-
 src/Avalonia.Controls/Slider.cs               |   8 +-
 .../Utils/BorderRenderHelper.cs               |   9 +-
 src/Avalonia.DesignerSupport/Remote/Stubs.cs  |   4 +
 src/Avalonia.Input/NavigationDirection.cs     |   2 +-
 src/Avalonia.Native/PopupImpl.cs              |   5 +
 .../Accents/BaseDark.xaml                     |  12 +-
 .../Accents/BaseLight.xaml                    |  12 +-
 .../Accents/FluentBaseDark.xaml               | 154 ++++++++-----
 .../Accents/FluentBaseLight.xaml              | 153 ++++++++-----
 .../Accents/FluentControlResourcesDark.xaml   | 149 +++++++++----
 .../Accents/FluentControlResourcesLight.xaml  | 149 +++++++++----
 .../AutoCompleteBox.xaml                      |  68 ++++--
 src/Avalonia.Themes.Fluent/PopupRoot.xaml     |  38 ++--
 src/Avalonia.Themes.Fluent/RadioButton.xaml   | 207 ++++++++++++++----
 src/Avalonia.Themes.Fluent/Slider.xaml        |  12 +-
 src/Avalonia.X11/X11Window.cs                 |   4 +
 src/Windows/Avalonia.Win32/PopupImpl.cs       |  34 ++-
 .../Mixins/PressedMixinTests.cs               |  37 ++++
 23 files changed, 806 insertions(+), 347 deletions(-)
 create mode 100644 src/Avalonia.Controls/Mixins/PressedMixin.cs
 create mode 100644 tests/Avalonia.Controls.UnitTests/Mixins/PressedMixinTests.cs

diff --git a/src/Avalonia.Controls/ListBoxItem.cs b/src/Avalonia.Controls/ListBoxItem.cs
index 46a7ccec0b..e04c79987f 100644
--- a/src/Avalonia.Controls/ListBoxItem.cs
+++ b/src/Avalonia.Controls/ListBoxItem.cs
@@ -20,6 +20,7 @@ namespace Avalonia.Controls
         static ListBoxItem()
         {
             SelectableMixin.Attach<ListBoxItem>(IsSelectedProperty);
+            PressedMixin.Attach<ListBoxItem>();
             FocusableProperty.OverrideDefaultValue<ListBoxItem>(true);
         }
 
@@ -31,34 +32,5 @@ namespace Avalonia.Controls
             get { return GetValue(IsSelectedProperty); }
             set { SetValue(IsSelectedProperty, value); }
         }
-
-        protected override void OnPointerPressed(PointerPressedEventArgs e)
-        {
-            base.OnPointerPressed(e);
-
-            if (e.GetCurrentPoint(this).Properties.IsLeftButtonPressed)
-            {
-                UpdatePseudoClasses(true);
-            }
-        }
-
-        protected override void OnPointerReleased(PointerReleasedEventArgs e)
-        {
-            base.OnPointerReleased(e);
-
-            UpdatePseudoClasses(false);
-        }
-
-        protected override void OnPointerCaptureLost(PointerCaptureLostEventArgs e)
-        {
-            base.OnPointerCaptureLost(e);
-
-            UpdatePseudoClasses(false);
-        }
-
-        private void UpdatePseudoClasses(bool isPressed)
-        {
-            PseudoClasses.Set(":pressed", isPressed);
-        }
     }
 }
diff --git a/src/Avalonia.Controls/Mixins/PressedMixin.cs b/src/Avalonia.Controls/Mixins/PressedMixin.cs
new file mode 100644
index 0000000000..4c5792b4a0
--- /dev/null
+++ b/src/Avalonia.Controls/Mixins/PressedMixin.cs
@@ -0,0 +1,37 @@
+using Avalonia.Interactivity;
+using Avalonia.Input;
+
+namespace Avalonia.Controls.Mixins
+{
+    /// <summary>
+    /// Adds pressed functionality to control classes.
+    /// 
+    /// Adds the ':pressed' class when the item is pressed.
+    /// </summary>
+    public static class PressedMixin
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PressedMixin"/> class.
+        /// </summary>
+        /// <typeparam name="TControl">The control type.</typeparam>
+        public static void Attach<TControl>() where TControl : Control
+        {
+            InputElement.PointerPressedEvent.AddClassHandler<TControl>((x, e) => HandlePointerPressed(x, e), RoutingStrategies.Tunnel);
+            InputElement.PointerReleasedEvent.AddClassHandler<TControl>((x, e) => HandlePointerReleased(x), RoutingStrategies.Tunnel);
+            InputElement.PointerCaptureLostEvent.AddClassHandler<TControl>((x, e) => HandlePointerReleased(x), RoutingStrategies.Tunnel);
+        }
+
+        private static void HandlePointerPressed<TControl>(TControl sender, PointerPressedEventArgs e) where TControl : Control
+        {
+            if (e.GetCurrentPoint(sender).Properties.IsLeftButtonPressed)
+            {
+                ((IPseudoClasses)sender.Classes).Set(":pressed", true);
+            }
+        }
+
+        private static void HandlePointerReleased<TControl>(TControl sender) where TControl : Control
+        {
+            ((IPseudoClasses)sender.Classes).Set(":pressed", false);
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/Platform/IPopupImpl.cs b/src/Avalonia.Controls/Platform/IPopupImpl.cs
index 3944695f04..477d5fab43 100644
--- a/src/Avalonia.Controls/Platform/IPopupImpl.cs
+++ b/src/Avalonia.Controls/Platform/IPopupImpl.cs
@@ -8,5 +8,7 @@ namespace Avalonia.Platform
     public interface IPopupImpl : IWindowBaseImpl
     {
         IPopupPositioner PopupPositioner { get; }
+
+        void SetWindowManagerAddShadowHint(bool enabled);
     }
 }
diff --git a/src/Avalonia.Controls/Primitives/Popup.cs b/src/Avalonia.Controls/Primitives/Popup.cs
index 66f2153b6c..49315e1b25 100644
--- a/src/Avalonia.Controls/Primitives/Popup.cs
+++ b/src/Avalonia.Controls/Primitives/Popup.cs
@@ -19,6 +19,9 @@ namespace Avalonia.Controls.Primitives
     /// </summary>
     public class Popup : Control, IVisualTreeHost
     {
+        public static readonly StyledProperty<bool> WindowManagerAddShadowHintProperty =
+            AvaloniaProperty.Register<PopupRoot, bool>(nameof(WindowManagerAddShadowHint), true);
+
         /// <summary>
         /// Defines the <see cref="Child"/> property.
         /// </summary>
@@ -89,7 +92,7 @@ namespace Avalonia.Controls.Primitives
         {
             IsHitTestVisibleProperty.OverrideDefaultValue<Popup>(false);
             ChildProperty.Changed.AddClassHandler<Popup>((x, e) => x.ChildChanged(e));
-            IsOpenProperty.Changed.AddClassHandler<Popup>((x, e) => x.IsOpenChanged((AvaloniaPropertyChangedEventArgs<bool>)e));
+            IsOpenProperty.Changed.AddClassHandler<Popup>((x, e) => x.IsOpenChanged((AvaloniaPropertyChangedEventArgs<bool>)e));            
         }
 
         /// <summary>
@@ -104,6 +107,12 @@ namespace Avalonia.Controls.Primitives
 
         public IPopupHost? Host => _openState?.PopupHost;
 
+        public bool WindowManagerAddShadowHint
+        {
+            get { return GetValue(WindowManagerAddShadowHintProperty); }
+            set { SetValue(WindowManagerAddShadowHintProperty, value); }
+        }
+
         /// <summary>
         /// Gets or sets the control to display in the popup.
         /// </summary>
@@ -293,6 +302,8 @@ namespace Avalonia.Controls.Primitives
 
             _openState = new PopupOpenState(topLevel, popupHost, cleanupPopup);
 
+            WindowManagerAddShadowHintChanged(popupHost, WindowManagerAddShadowHint);
+
             popupHost.Show();
 
             using (BeginIgnoringIsOpen())
@@ -332,6 +343,14 @@ namespace Avalonia.Controls.Primitives
             return Disposable.Create((unsubscribe, target, handler), state => state.unsubscribe(state.target, state.handler));
         }
 
+        private void WindowManagerAddShadowHintChanged(IPopupHost host, bool hint)
+        {
+            if(host is PopupRoot pr)
+            {
+                pr.PlatformImpl.SetWindowManagerAddShadowHint(hint);
+            }
+        }
+
         /// <summary>
         /// Called when the <see cref="IsOpen"/> property changes.
         /// </summary>
diff --git a/src/Avalonia.Controls/Primitives/PopupRoot.cs b/src/Avalonia.Controls/Primitives/PopupRoot.cs
index 788fe03162..aab7a68795 100644
--- a/src/Avalonia.Controls/Primitives/PopupRoot.cs
+++ b/src/Avalonia.Controls/Primitives/PopupRoot.cs
@@ -17,14 +17,14 @@ namespace Avalonia.Controls.Primitives
     public sealed class PopupRoot : WindowBase, IInteractive, IHostedVisualTreeRoot, IDisposable, IStyleHost, IPopupHost
     {
         private readonly TopLevel _parent;
-        private PopupPositionerParameters _positionerParameters;
+        private PopupPositionerParameters _positionerParameters;        
 
         /// <summary>
         /// Initializes static members of the <see cref="PopupRoot"/> class.
         /// </summary>
         static PopupRoot()
         {
-            BackgroundProperty.OverrideDefaultValue(typeof(PopupRoot), Brushes.White);
+            BackgroundProperty.OverrideDefaultValue(typeof(PopupRoot), Brushes.White);            
         }
 
         /// <summary>
@@ -53,7 +53,7 @@ namespace Avalonia.Controls.Primitives
         /// Gets the platform-specific window implementation.
         /// </summary>
         [CanBeNull]
-        public new IPopupImpl PlatformImpl => (IPopupImpl)base.PlatformImpl;
+        public new IPopupImpl PlatformImpl => (IPopupImpl)base.PlatformImpl;               
 
         /// <summary>
         /// Gets the parent control in the event route.
diff --git a/src/Avalonia.Controls/Slider.cs b/src/Avalonia.Controls/Slider.cs
index b218c003c2..2db7c5cb83 100644
--- a/src/Avalonia.Controls/Slider.cs
+++ b/src/Avalonia.Controls/Slider.cs
@@ -1,6 +1,6 @@
 using System;
+using Avalonia.Controls.Mixins;
 using Avalonia.Controls.Primitives;
-using Avalonia.Data;
 using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.Layout;
@@ -40,13 +40,11 @@ namespace Avalonia.Controls
         /// </summary>
         static Slider()
         {
+            PressedMixin.Attach<Slider>();
             OrientationProperty.OverrideDefaultValue(typeof(Slider), Orientation.Horizontal);
             Thumb.DragStartedEvent.AddClassHandler<Slider>((x, e) => x.OnThumbDragStarted(e), RoutingStrategies.Bubble);
             Thumb.DragDeltaEvent.AddClassHandler<Slider>((x, e) => x.OnThumbDragDelta(e), RoutingStrategies.Bubble);
-            Thumb.DragCompletedEvent.AddClassHandler<Slider>((x, e) => x.OnThumbDragCompleted(e), RoutingStrategies.Bubble);
-            PointerPressedEvent.AddClassHandler<Slider>((x, e) => x.HandlePointerPressed(e), RoutingStrategies.Tunnel, true);
-            PointerReleasedEvent.AddClassHandler<Slider>((x, e) => x.HandlePointerReleased(), RoutingStrategies.Tunnel, true);
-            PointerCaptureLostEvent.AddClassHandler<Slider>((x, e) => x.HandlePointerReleased(), RoutingStrategies.Tunnel, true);
+            Thumb.DragCompletedEvent.AddClassHandler<Slider>((x, e) => x.OnThumbDragCompleted(e), RoutingStrategies.Bubble);            
         }
 
         /// <summary>
diff --git a/src/Avalonia.Controls/Utils/BorderRenderHelper.cs b/src/Avalonia.Controls/Utils/BorderRenderHelper.cs
index 586fe4d341..51eb6edbea 100644
--- a/src/Avalonia.Controls/Utils/BorderRenderHelper.cs
+++ b/src/Avalonia.Controls/Utils/BorderRenderHelper.cs
@@ -118,12 +118,11 @@ namespace Avalonia.Controls.Utils
                     pen = new Pen(borderBrush, borderThickness);
                 }
 
-                var rrect = new RoundedRect(new Rect(_size), _cornerRadius.TopLeft, _cornerRadius.TopRight,
-                    _cornerRadius.BottomRight, _cornerRadius.BottomLeft);
+                var rect = new Rect(_size);
                 if (Math.Abs(borderThickness) > double.Epsilon)
-                {
-                    rrect = rrect.Deflate(borderThickness * 0.5, borderThickness * 0.5);
-                }
+                    rect = rect.Deflate(borderThickness * 0.5);
+                var rrect = new RoundedRect(rect, _cornerRadius.TopLeft, _cornerRadius.TopRight,
+                    _cornerRadius.BottomRight, _cornerRadius.BottomLeft);
 
                 context.PlatformImpl.DrawRectangle(background, pen, rrect, boxShadows);
             }
diff --git a/src/Avalonia.DesignerSupport/Remote/Stubs.cs b/src/Avalonia.DesignerSupport/Remote/Stubs.cs
index a9665b1519..c2565cc59c 100644
--- a/src/Avalonia.DesignerSupport/Remote/Stubs.cs
+++ b/src/Avalonia.DesignerSupport/Remote/Stubs.cs
@@ -146,6 +146,10 @@ namespace Avalonia.DesignerSupport.Remote
 
         public void SetTransparencyLevelHint(WindowTransparencyLevel transparencyLevel) { }
 
+        public void SetWindowManagerAddShadowHint(bool enabled)
+        {
+        }
+
         public WindowTransparencyLevel TransparencyLevel { get; private set; }
     }
 
diff --git a/src/Avalonia.Input/NavigationDirection.cs b/src/Avalonia.Input/NavigationDirection.cs
index 34bedac141..9b9af0b0a6 100644
--- a/src/Avalonia.Input/NavigationDirection.cs
+++ b/src/Avalonia.Input/NavigationDirection.cs
@@ -102,7 +102,7 @@ namespace Avalonia.Input
             switch (key)
             {
                 case Key.Tab:
-                    return (modifiers & KeyModifiers.Shift) != 0 ?
+                    return (modifiers & KeyModifiers.Shift) == 0 ?
                         NavigationDirection.Next : NavigationDirection.Previous;
                 case Key.Up:
                     return NavigationDirection.Up;
diff --git a/src/Avalonia.Native/PopupImpl.cs b/src/Avalonia.Native/PopupImpl.cs
index e4ee293757..c41be1723b 100644
--- a/src/Avalonia.Native/PopupImpl.cs
+++ b/src/Avalonia.Native/PopupImpl.cs
@@ -59,6 +59,11 @@ namespace Avalonia.Native
         }
 
         public override IPopupImpl CreatePopup() => new PopupImpl(_factory, _opts, _glFeature, this);
+
+        public void SetWindowManagerAddShadowHint(bool enabled)
+        {
+        }
+
         public IPopupPositioner PopupPositioner { get; }
     }
 }
diff --git a/src/Avalonia.Themes.Fluent/Accents/BaseDark.xaml b/src/Avalonia.Themes.Fluent/Accents/BaseDark.xaml
index 7ce6c5a19f..bf169400f0 100644
--- a/src/Avalonia.Themes.Fluent/Accents/BaseDark.xaml
+++ b/src/Avalonia.Themes.Fluent/Accents/BaseDark.xaml
@@ -139,6 +139,7 @@
     <SolidColorBrush x:Key="SystemControlErrorTextForegroundBrush" Color="{StaticResource SystemErrorTextColor}" />
     <SolidColorBrush x:Key="SystemControlTransientBorderBrush" Color="#000000" Opacity="0.36" />
     <!--<AcrylicBrush x:Key="SystemControlTransientBackgroundBrush" BackgroundSource="HostBackdrop" TintColor="{StaticResource SystemChromeAltHighColor}" TintOpacity="0.8" FallbackColor="{StaticResource SystemChromeMediumLowColor}" />-->
+    <SolidColorBrush x:Key="SystemControlTransientBackgroundBrush" Color="{StaticResource SystemChromeMediumLowColor}" />
     <StaticResource x:Key="SystemControlDescriptionTextForegroundBrush" ResourceKey="SystemControlPageTextBaseMediumBrush" />
     <x:Boolean x:Key="IsApplicationFocusVisualKindReveal">False</x:Boolean>
 
@@ -159,8 +160,7 @@
     <x:Double x:Key="AppBarThemeMinimalHeight">24</x:Double>
     <x:Double x:Key="AppBarThemeCompactHeight">40</x:Double>
     <x:Double x:Key="AppBarExpandButtonCircleDiameter">3</x:Double>
-    <x:Double x:Key="AutoSuggestListMaxHeight">374</x:Double>
-    <x:Double x:Key="AutoSuggestListBorderOpacity">0</x:Double>
+    <x:Double x:Key="AutoCompleteListBorderOpacity">0</x:Double>
     <Thickness x:Key="CheckBoxBorderThemeThickness">2</Thickness>
     <Thickness x:Key="CheckBoxCheckedStrokeThickness">0</Thickness>
     <x:Double x:Key="ComboBoxArrowThemeFontSize">21</x:Double>
@@ -258,10 +258,10 @@
     <Thickness x:Key="AppBarTopBorderThemeThickness">0,0,0,0</Thickness>
     <Thickness x:Key="AppBarTopThemePadding">0,0,0,0</Thickness>
     <Thickness x:Key="AppBarExpandButtonCircleInnerPadding">3,0,3,0</Thickness>
-    <Thickness x:Key="AutoSuggestListBorderThemeThickness">1</Thickness>
-    <Thickness x:Key="AutoSuggestListMargin">0,2,0,2</Thickness>
-    <Thickness x:Key="AutoSuggestListPadding">-1,0,-1,0</Thickness>
-    <Thickness x:Key="AutoSuggestListViewItemMargin">12,11,0,13</Thickness>
+    <Thickness x:Key="AutoCompleteListBorderThemeThickness">1</Thickness>
+    <Thickness x:Key="AutoCompleteListMargin">0,2,0,2</Thickness>
+    <Thickness x:Key="AutoCompleteListPadding">-1,0,-1,0</Thickness>
+    <Thickness x:Key="AutoCompleteListViewItemMargin">12,11,0,13</Thickness>
     <Thickness x:Key="ButtonBorderThemeThickness">2</Thickness>
     <Thickness x:Key="CalendarDatePickerBorderThemeThickness">2</Thickness>
     <Thickness x:Key="ComboBoxBorderThemeThickness">2</Thickness>
diff --git a/src/Avalonia.Themes.Fluent/Accents/BaseLight.xaml b/src/Avalonia.Themes.Fluent/Accents/BaseLight.xaml
index 026edca4f9..b32c816851 100644
--- a/src/Avalonia.Themes.Fluent/Accents/BaseLight.xaml
+++ b/src/Avalonia.Themes.Fluent/Accents/BaseLight.xaml
@@ -139,6 +139,7 @@
     <SolidColorBrush x:Key="SystemControlErrorTextForegroundBrush" Color="{StaticResource SystemErrorTextColor}" />
     <SolidColorBrush x:Key="SystemControlTransientBorderBrush" Color="#000000" Opacity="0.14" />
     <!--<AcrylicBrush x:Key="SystemControlTransientBackgroundBrush" BackgroundSource="HostBackdrop" TintColor="{StaticResource SystemChromeAltHighColor}" TintOpacity="0.8" FallbackColor="{StaticResource SystemChromeMediumLowColor}" />-->
+    <SolidColorBrush x:Key="SystemControlTransientBackgroundBrush" Color="{StaticResource SystemChromeMediumLowColor}" />
     <StaticResource x:Key="SystemControlDescriptionTextForegroundBrush" ResourceKey="SystemControlPageTextBaseMediumBrush" />
     <x:Boolean x:Key="IsApplicationFocusVisualKindReveal">False</x:Boolean>
 
@@ -158,8 +159,7 @@
     <x:Double x:Key="AppBarThemeMinimalHeight">24</x:Double>
     <x:Double x:Key="AppBarThemeCompactHeight">40</x:Double>
     <x:Double x:Key="AppBarExpandButtonCircleDiameter">3</x:Double>
-    <x:Double x:Key="AutoSuggestListMaxHeight">374</x:Double>
-    <x:Double x:Key="AutoSuggestListBorderOpacity">0</x:Double>
+    <x:Double x:Key="AutoCompleteListBorderOpacity">0</x:Double>
     <Thickness x:Key="CheckBoxBorderThemeThickness">2</Thickness>
     <Thickness x:Key="CheckBoxCheckedStrokeThickness">0</Thickness>
     <x:Double x:Key="ComboBoxArrowThemeFontSize">21</x:Double>
@@ -257,10 +257,10 @@
     <Thickness x:Key="AppBarTopBorderThemeThickness">0,0,0,0</Thickness>
     <Thickness x:Key="AppBarTopThemePadding">0,0,0,0</Thickness>
     <Thickness x:Key="AppBarExpandButtonCircleInnerPadding">3,0,3,0</Thickness>
-    <Thickness x:Key="AutoSuggestListBorderThemeThickness">1</Thickness>
-    <Thickness x:Key="AutoSuggestListMargin">0,2,0,2</Thickness>
-    <Thickness x:Key="AutoSuggestListPadding">-1,0,-1,0</Thickness>
-    <Thickness x:Key="AutoSuggestListViewItemMargin">12,11,0,13</Thickness>
+    <Thickness x:Key="AutoCompleteListBorderThemeThickness">1</Thickness>
+    <Thickness x:Key="AutoCompleteListMargin">0,2,0,2</Thickness>
+    <Thickness x:Key="AutoCompleteListPadding">-1,0,-1,0</Thickness>
+    <Thickness x:Key="AutoCompleteListViewItemMargin">12,11,0,13</Thickness>
     <Thickness x:Key="ButtonBorderThemeThickness">2</Thickness>
     <Thickness x:Key="CalendarDatePickerBorderThemeThickness">2</Thickness>
     <Thickness x:Key="ComboBoxBorderThemeThickness">2</Thickness>
diff --git a/src/Avalonia.Themes.Fluent/Accents/FluentBaseDark.xaml b/src/Avalonia.Themes.Fluent/Accents/FluentBaseDark.xaml
index ab4806d6cd..865f9e8759 100644
--- a/src/Avalonia.Themes.Fluent/Accents/FluentBaseDark.xaml
+++ b/src/Avalonia.Themes.Fluent/Accents/FluentBaseDark.xaml
@@ -1,5 +1,5 @@
-<Style xmlns="https://github.com/avaloniaui"
-  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+<Style xmlns="https://github.com/avaloniaui" 
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
   xmlns:sys="clr-namespace:System;assembly=netstandard">
   <Style.Resources>
     <Color x:Key="SystemAccentColor">#FF0078D7</Color>
@@ -33,9 +33,11 @@
     <Color x:Key="SystemRevealListLowColor">#FF1D1D1D</Color>
     <Color x:Key="SystemRevealListMediumColor">#FF333333</Color>
     <!--<AcrylicBrush x:Key="SystemControlAcrylicWindowBrush" BackgroundSource="HostBackdrop" TintColor="{ThemeResource SystemChromeAltHighColor}" TintOpacity="0.8" FallbackColor="{ThemeResource SystemChromeMediumColor}" />-->
+    
     <!-- Override system shape defaults -->
     <CornerRadius x:Key="ControlCornerRadius">2,2,2,2</CornerRadius>
     <CornerRadius x:Key="OverlayCornerRadius">4,4,4,4</CornerRadius>
+    
     <!-- Override system borders -->
     <Thickness x:Key="MenuBarItemBorderThickness">1,1,1,1</Thickness>
     <Thickness x:Key="GridViewItemMultiselectBorderThickness">1,1,1,1</Thickness>
@@ -61,6 +63,7 @@
     <Thickness x:Key="GridViewItemRevealBorderThemeThickness">1,1,1,1</Thickness>
     <Thickness x:Key="ComboBoxItemRevealBorderThemeThickness">1,1,1,1</Thickness>
     <x:Double x:Key="PersonPictureEllipseBadgeStrokeThickness">1</x:Double>
+    
     <!-- Override system generated accent colors -->
     <Color x:Key="SystemAccentColorDark1">#FF005A9E</Color>
     <Color x:Key="SystemAccentColorDark2">#FF004275</Color>
@@ -70,7 +73,7 @@
     <Color x:Key="SystemAccentColorLight3">#FFA6D8FF</Color>
     <Color x:Key="RegionColor">#FF000000</Color>
     <SolidColorBrush x:Key="RegionBrush" Color="{StaticResource RegionColor}" />
-
+    
     <!-- BaseResources for Button.xaml -->
     <StaticResource x:Key="ButtonBackground" ResourceKey="SystemControlBackgroundBaseLowBrush" />
     <StaticResource x:Key="ButtonBackgroundPointerOver" ResourceKey="SystemControlBackgroundBaseLowBrush" />
@@ -84,6 +87,62 @@
     <StaticResource x:Key="ButtonBorderBrushPointerOver" ResourceKey="SystemControlHighlightBaseMediumLowBrush" />
     <StaticResource x:Key="ButtonBorderBrushPressed" ResourceKey="SystemControlHighlightTransparentBrush" />
     <StaticResource x:Key="ButtonBorderBrushDisabled" ResourceKey="SystemControlDisabledTransparentBrush" />
+    
+    <!-- BaseResources for ListBox.xaml -->
+    <Thickness x:Key="ListBoxBorderThemeThickness">0</Thickness>
+    <SolidColorBrush x:Key="ListBoxBackgroundThemeBrush" Color="#CCFFFFFF" />
+    <SolidColorBrush x:Key="ListBoxBorderThemeBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="ListBoxDisabledForegroundThemeBrush" Color="#66FFFFFF" />
+    <SolidColorBrush x:Key="ListBoxFocusBackgroundThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="ListBoxForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="ListBoxItemDisabledForegroundThemeBrush" Color="#66FFFFFF" />
+    <SolidColorBrush x:Key="ListBoxItemPointerOverBackgroundThemeBrush" Color="#21000000" />
+    <SolidColorBrush x:Key="ListBoxItemPointerOverForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="ListBoxItemPressedBackgroundThemeBrush" Color="#FFD3D3D3" />
+    <SolidColorBrush x:Key="ListBoxItemPressedForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="ListBoxItemSelectedBackgroundThemeBrush" Color="#FF4617B4" />
+    <SolidColorBrush x:Key="ListBoxItemSelectedDisabledBackgroundThemeBrush" Color="#66FFFFFF" />
+    <SolidColorBrush x:Key="ListBoxItemSelectedDisabledForegroundThemeBrush" Color="#99000000" />
+    <SolidColorBrush x:Key="ListBoxItemSelectedForegroundThemeBrush" Color="White" />
+    <SolidColorBrush x:Key="ListBoxItemSelectedPointerOverBackgroundThemeBrush" Color="#FF5F37BE" />
+    
+    <!-- BaseResources for TextBox.xaml -->
+    <StaticResource x:Key="TextControlForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="TextControlForegroundPointerOver" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="TextControlForegroundFocused" ResourceKey="SystemControlForegroundChromeBlackHighBrush" />
+    <StaticResource x:Key="TextControlForegroundDisabled" ResourceKey="SystemControlDisabledChromeDisabledLowBrush" />
+    <StaticResource x:Key="TextControlBackground" ResourceKey="SystemControlBackgroundAltMediumLowBrush" />
+    <StaticResource x:Key="TextControlBackgroundPointerOver" ResourceKey="SystemControlBackgroundAltMediumBrush" />
+    <StaticResource x:Key="TextControlBackgroundFocused" ResourceKey="SystemControlBackgroundChromeWhiteBrush" />
+    <StaticResource x:Key="TextControlBackgroundDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <StaticResource x:Key="TextControlBorderBrush" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
+    <StaticResource x:Key="TextControlBorderBrushPointerOver" ResourceKey="SystemControlHighlightBaseMediumBrush" />
+    <StaticResource x:Key="TextControlBorderBrushFocused" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="TextControlBorderBrushDisabled" ResourceKey="SystemControlDisabledBaseLowBrush" />
+    <StaticResource x:Key="TextControlPlaceholderForeground" ResourceKey="SystemControlPageTextBaseMediumBrush" />
+    <StaticResource x:Key="TextControlPlaceholderForegroundPointerOver" ResourceKey="SystemControlPageTextBaseMediumBrush" />
+    <StaticResource x:Key="TextControlPlaceholderForegroundFocused" ResourceKey="SystemControlPageTextChromeBlackMediumLowBrush" />
+    <StaticResource x:Key="TextControlPlaceholderForegroundDisabled" ResourceKey="SystemControlDisabledChromeDisabledLowBrush" />
+    <StaticResource x:Key="TextControlHeaderForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="TextControlHeaderForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="TextControlSelectionHighlightColor" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="TextControlButtonBackground" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="TextControlButtonBackgroundPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="TextControlButtonBackgroundPressed" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="TextControlButtonBorderBrush" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="TextControlButtonBorderBrushPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="TextControlButtonBorderBrushPressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="TextControlButtonForeground" ResourceKey="SystemControlForegroundChromeBlackMediumBrush" />
+    <StaticResource x:Key="TextControlButtonForegroundPointerOver" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="TextControlButtonForegroundPressed" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <StaticResource x:Key="ContentLinkForegroundColor" ResourceKey="SystemControlHyperlinkTextBrush" />
+    <StaticResource x:Key="ContentLinkBackgroundColor" ResourceKey="SystemControlPageBackgroundChromeLowBrush" />
+
+    <!-- Resources for AutoCompleteBox.xaml -->
+    <StaticResource x:Key="AutoCompleteBoxLightDismissOverlayBackground" ResourceKey="SystemControlPageBackgroundMediumAltMediumBrush" />
+    <StaticResource x:Key="AutoCompleteBoxSuggestionsListBackground" ResourceKey="SystemControlBackgroundChromeMediumLowBrush" />
+    <StaticResource x:Key="AutoCompleteBoxSuggestionsListBorderBrush" ResourceKey="SystemControlForegroundChromeHighBrush" />
+    <x:Double x:Key="AutoCompleteBoxIconFontSize">12</x:Double>
 
     <!-- BaseResources for CheckBox.xaml -->
     <StaticResource x:Key="CheckBoxForegroundUnchecked" ResourceKey="SystemControlForegroundBaseHighBrush" />
@@ -158,25 +217,44 @@
     <StaticResource x:Key="CheckBoxCheckGlyphForegroundIndeterminatePointerOver" ResourceKey="SystemControlForegroundBaseHighBrush" />
     <StaticResource x:Key="CheckBoxCheckGlyphForegroundIndeterminatePressed" ResourceKey="SystemControlForegroundBaseMediumBrush" />
     <StaticResource x:Key="CheckBoxCheckGlyphForegroundIndeterminateDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
-
-    <!-- BaseResources for ListBox.xaml -->
-    <Thickness x:Key="ListBoxBorderThemeThickness">0</Thickness>
-    <SolidColorBrush x:Key="ListBoxBackgroundThemeBrush" Color="#CCFFFFFF" />
-    <SolidColorBrush x:Key="ListBoxBorderThemeBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="ListBoxDisabledForegroundThemeBrush" Color="#66FFFFFF" />
-    <SolidColorBrush x:Key="ListBoxFocusBackgroundThemeBrush" Color="#FFFFFFFF" />
-    <SolidColorBrush x:Key="ListBoxForegroundThemeBrush" Color="#FF000000" />
-    <SolidColorBrush x:Key="ListBoxItemDisabledForegroundThemeBrush" Color="#66FFFFFF" />
-    <SolidColorBrush x:Key="ListBoxItemPointerOverBackgroundThemeBrush" Color="#21000000" />
-    <SolidColorBrush x:Key="ListBoxItemPointerOverForegroundThemeBrush" Color="#FF000000" />
-    <SolidColorBrush x:Key="ListBoxItemPressedBackgroundThemeBrush" Color="#FFD3D3D3" />
-    <SolidColorBrush x:Key="ListBoxItemPressedForegroundThemeBrush" Color="#FF000000" />
-    <SolidColorBrush x:Key="ListBoxItemSelectedBackgroundThemeBrush" Color="#FF4617B4" />
-    <SolidColorBrush x:Key="ListBoxItemSelectedDisabledBackgroundThemeBrush" Color="#66FFFFFF" />
-    <SolidColorBrush x:Key="ListBoxItemSelectedDisabledForegroundThemeBrush" Color="#99000000" />
-    <SolidColorBrush x:Key="ListBoxItemSelectedForegroundThemeBrush" Color="White" />
-    <SolidColorBrush x:Key="ListBoxItemSelectedPointerOverBackgroundThemeBrush" Color="#FF5F37BE" />
-
+    
+    <!-- BaseResources for RadioButton.xaml -->
+    <StaticResource x:Key="RadioButtonForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="RadioButtonForegroundPointerOver" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="RadioButtonForegroundPressed" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="RadioButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="RadioButtonBackground" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonBackgroundPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonBackgroundPressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonBorderBrush" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonBorderBrushPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonBorderBrushPressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonBorderBrushDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseStroke" ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseStrokePointerOver" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseStrokePressed" ResourceKey="SystemControlHighlightBaseMediumBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseStrokeDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseFill" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseFillPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseFillPressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseFillDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseCheckedStroke" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseCheckedStrokePointerOver" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseCheckedStrokePressed" ResourceKey="SystemControlHighlightBaseMediumBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseCheckedStrokeDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseCheckedFill" ResourceKey="SystemControlHighlightAltTransparentBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseCheckedFillPointerOver" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseCheckedFillPressed" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseCheckedFillDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonCheckGlyphFill" ResourceKey="SystemControlHighlightBaseMediumHighBrush" />
+    <StaticResource x:Key="RadioButtonCheckGlyphFillPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <StaticResource x:Key="RadioButtonCheckGlyphFillPressed" ResourceKey="SystemControlHighlightAltBaseMediumBrush" />
+    <StaticResource x:Key="RadioButtonCheckGlyphFillDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="RadioButtonCheckGlyphStroke" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonCheckGlyphStrokePointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonCheckGlyphStrokePressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonCheckGlyphStrokeDisabled" ResourceKey="SystemControlTransparentBrush" />
     <!-- BaseResources for Slider.xaml -->
     <StaticResource x:Key="SliderContainerBackground" ResourceKey="SystemControlTransparentBrush" />
     <StaticResource x:Key="SliderContainerBackgroundPointerOver" ResourceKey="SystemControlTransparentBrush" />
@@ -199,37 +277,5 @@
     <StaticResource x:Key="SliderTickBarFill" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
     <StaticResource x:Key="SliderTickBarFillDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
     <StaticResource x:Key="SliderInlineTickBarFill" ResourceKey="SystemControlBackgroundAltHighBrush" />
-
-    <!-- BaseResources for TextBox.xaml -->
-    <StaticResource x:Key="TextControlForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
-    <StaticResource x:Key="TextControlForegroundPointerOver" ResourceKey="SystemControlForegroundBaseHighBrush" />
-    <StaticResource x:Key="TextControlForegroundFocused" ResourceKey="SystemControlForegroundChromeBlackHighBrush" />
-    <StaticResource x:Key="TextControlForegroundDisabled" ResourceKey="SystemControlDisabledChromeDisabledLowBrush" />
-    <StaticResource x:Key="TextControlBackground" ResourceKey="SystemControlBackgroundAltMediumLowBrush" />
-    <StaticResource x:Key="TextControlBackgroundPointerOver" ResourceKey="SystemControlBackgroundAltMediumBrush" />
-    <StaticResource x:Key="TextControlBackgroundFocused" ResourceKey="SystemControlBackgroundChromeWhiteBrush" />
-    <StaticResource x:Key="TextControlBackgroundDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
-    <StaticResource x:Key="TextControlBorderBrush" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
-    <StaticResource x:Key="TextControlBorderBrushPointerOver" ResourceKey="SystemControlHighlightBaseMediumBrush" />
-    <StaticResource x:Key="TextControlBorderBrushFocused" ResourceKey="SystemControlHighlightAccentBrush" />
-    <StaticResource x:Key="TextControlBorderBrushDisabled" ResourceKey="SystemControlDisabledBaseLowBrush" />
-    <StaticResource x:Key="TextControlPlaceholderForeground" ResourceKey="SystemControlPageTextBaseMediumBrush" />
-    <StaticResource x:Key="TextControlPlaceholderForegroundPointerOver" ResourceKey="SystemControlPageTextBaseMediumBrush" />
-    <StaticResource x:Key="TextControlPlaceholderForegroundFocused" ResourceKey="SystemControlPageTextChromeBlackMediumLowBrush" />
-    <StaticResource x:Key="TextControlPlaceholderForegroundDisabled" ResourceKey="SystemControlDisabledChromeDisabledLowBrush" />
-    <StaticResource x:Key="TextControlHeaderForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
-    <StaticResource x:Key="TextControlHeaderForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
-    <StaticResource x:Key="TextControlSelectionHighlightColor" ResourceKey="SystemControlHighlightAccentBrush" />
-    <StaticResource x:Key="TextControlButtonBackground" ResourceKey="SystemControlTransparentBrush" />
-    <StaticResource x:Key="TextControlButtonBackgroundPointerOver" ResourceKey="SystemControlTransparentBrush" />
-    <StaticResource x:Key="TextControlButtonBackgroundPressed" ResourceKey="SystemControlHighlightAccentBrush" />
-    <StaticResource x:Key="TextControlButtonBorderBrush" ResourceKey="SystemControlTransparentBrush" />
-    <StaticResource x:Key="TextControlButtonBorderBrushPointerOver" ResourceKey="SystemControlTransparentBrush" />
-    <StaticResource x:Key="TextControlButtonBorderBrushPressed" ResourceKey="SystemControlTransparentBrush" />
-    <StaticResource x:Key="TextControlButtonForeground" ResourceKey="SystemControlForegroundChromeBlackMediumBrush" />
-    <StaticResource x:Key="TextControlButtonForegroundPointerOver" ResourceKey="SystemControlHighlightAccentBrush" />
-    <StaticResource x:Key="TextControlButtonForegroundPressed" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
-    <StaticResource x:Key="ContentLinkForegroundColor" ResourceKey="SystemControlHyperlinkTextBrush" />
-    <StaticResource x:Key="ContentLinkBackgroundColor" ResourceKey="SystemControlPageBackgroundChromeLowBrush" />
   </Style.Resources>
 </Style>
diff --git a/src/Avalonia.Themes.Fluent/Accents/FluentBaseLight.xaml b/src/Avalonia.Themes.Fluent/Accents/FluentBaseLight.xaml
index 1d3e415e90..ae69e82ea5 100644
--- a/src/Avalonia.Themes.Fluent/Accents/FluentBaseLight.xaml
+++ b/src/Avalonia.Themes.Fluent/Accents/FluentBaseLight.xaml
@@ -1,5 +1,5 @@
-<Style xmlns="https://github.com/avaloniaui"
-  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+<Style xmlns="https://github.com/avaloniaui" 
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
   xmlns:sys="clr-namespace:System;assembly=netstandard">
   <Style.Resources>
     <Color x:Key="SystemAccentColor">#FF0078D7</Color>
@@ -33,9 +33,11 @@
     <Color x:Key="SystemRevealListLowColor">#FFE6E6E6</Color>
     <Color x:Key="SystemRevealListMediumColor">#FFCCCCCC</Color>
     <!--<AcrylicBrush x:Key="SystemControlAcrylicWindowBrush" BackgroundSource="HostBackdrop" TintColor="{ThemeResource SystemChromeAltHighColor}" TintOpacity="0.8" FallbackColor="{ThemeResource SystemChromeMediumColor}" />-->
+    
     <!-- Override system shape defaults -->
     <CornerRadius x:Key="ControlCornerRadius">2,2,2,2</CornerRadius>
     <CornerRadius x:Key="OverlayCornerRadius">4,4,4,4</CornerRadius>
+    
     <!-- Override system borders -->
     <Thickness x:Key="MenuBarItemBorderThickness">1,1,1,1</Thickness>
     <Thickness x:Key="GridViewItemMultiselectBorderThickness">1,1,1,1</Thickness>
@@ -61,6 +63,7 @@
     <Thickness x:Key="GridViewItemRevealBorderThemeThickness">1,1,1,1</Thickness>
     <Thickness x:Key="ComboBoxItemRevealBorderThemeThickness">1,1,1,1</Thickness>
     <x:Double x:Key="PersonPictureEllipseBadgeStrokeThickness">1</x:Double>
+    
     <!-- Override system generated accent colors -->
     <Color x:Key="SystemAccentColorDark1">#FF005A9E</Color>
     <Color x:Key="SystemAccentColorDark2">#FF004275</Color>
@@ -71,7 +74,7 @@
     <!--<RevealBackgroundBrush x:Key="SystemControlHighlightListLowRevealBackgroundBrush" TargetTheme="Light" Color="{ThemeResource SystemRevealListMediumColor}" FallbackColor="{ StaticResource SystemListMediumColor}" />-->
     <Color x:Key="RegionColor">#FFFFFFFF</Color>
     <SolidColorBrush x:Key="RegionBrush" Color="{StaticResource RegionColor}" />
-
+    
     <!-- BaseResources for Button.xaml -->
     <StaticResource x:Key="ButtonBackground" ResourceKey="SystemControlBackgroundBaseLowBrush" />
     <StaticResource x:Key="ButtonBackgroundPointerOver" ResourceKey="SystemControlBackgroundBaseLowBrush" />
@@ -85,6 +88,61 @@
     <StaticResource x:Key="ButtonBorderBrushPointerOver" ResourceKey="SystemControlHighlightBaseMediumLowBrush" />
     <StaticResource x:Key="ButtonBorderBrushPressed" ResourceKey="SystemControlHighlightTransparentBrush" />
     <StaticResource x:Key="ButtonBorderBrushDisabled" ResourceKey="SystemControlDisabledTransparentBrush" />
+    <!-- BaseResources for Listbox.xaml -->
+    <Thickness x:Key="ListBoxBorderThemeThickness">0</Thickness>
+    <SolidColorBrush x:Key="ListBoxBackgroundThemeBrush" Color="#CCFFFFFF" />
+    <SolidColorBrush x:Key="ListBoxBorderThemeBrush" Color="#45000000" />
+    <SolidColorBrush x:Key="ListBoxDisabledForegroundThemeBrush" Color="#66000000" />
+    <SolidColorBrush x:Key="ListBoxFocusBackgroundThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="ListBoxForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="ListBoxItemDisabledForegroundThemeBrush" Color="#66000000" />
+    <SolidColorBrush x:Key="ListBoxItemPointerOverBackgroundThemeBrush" Color="#21000000" />
+    <SolidColorBrush x:Key="ListBoxItemPointerOverForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="ListBoxItemPressedBackgroundThemeBrush" Color="#FFD3D3D3" />
+    <SolidColorBrush x:Key="ListBoxItemPressedForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="ListBoxItemSelectedBackgroundThemeBrush" Color="#FF4617B4" />
+    <SolidColorBrush x:Key="ListBoxItemSelectedDisabledBackgroundThemeBrush" Color="#8C000000" />
+    <SolidColorBrush x:Key="ListBoxItemSelectedDisabledForegroundThemeBrush" Color="#99FFFFFF" />
+    <SolidColorBrush x:Key="ListBoxItemSelectedForegroundThemeBrush" Color="White" />
+    <SolidColorBrush x:Key="ListBoxItemSelectedPointerOverBackgroundThemeBrush" Color="#FF5F37BE" />
+    
+    <!-- BaseResources for TextBox.xaml -->
+    <StaticResource x:Key="TextControlForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="TextControlForegroundPointerOver" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="TextControlForegroundFocused" ResourceKey="SystemControlForegroundChromeBlackHighBrush" />
+    <StaticResource x:Key="TextControlForegroundDisabled" ResourceKey="SystemControlDisabledChromeDisabledLowBrush" />
+    <StaticResource x:Key="TextControlBackground" ResourceKey="SystemControlBackgroundAltMediumLowBrush" />
+    <StaticResource x:Key="TextControlBackgroundPointerOver" ResourceKey="SystemControlBackgroundAltMediumBrush" />
+    <StaticResource x:Key="TextControlBackgroundFocused" ResourceKey="SystemControlBackgroundChromeWhiteBrush" />
+    <StaticResource x:Key="TextControlBackgroundDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+    <StaticResource x:Key="TextControlBorderBrush" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
+    <StaticResource x:Key="TextControlBorderBrushPointerOver" ResourceKey="SystemControlHighlightBaseMediumBrush" />
+    <StaticResource x:Key="TextControlBorderBrushFocused" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="TextControlBorderBrushDisabled" ResourceKey="SystemControlDisabledBaseLowBrush" />
+    <StaticResource x:Key="TextControlPlaceholderForeground" ResourceKey="SystemControlPageTextBaseMediumBrush" />
+    <StaticResource x:Key="TextControlPlaceholderForegroundPointerOver" ResourceKey="SystemControlPageTextBaseMediumBrush" />
+    <StaticResource x:Key="TextControlPlaceholderForegroundFocused" ResourceKey="SystemControlPageTextChromeBlackMediumLowBrush" />
+    <StaticResource x:Key="TextControlPlaceholderForegroundDisabled" ResourceKey="SystemControlDisabledChromeDisabledLowBrush" />
+    <StaticResource x:Key="TextControlHeaderForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="TextControlHeaderForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="TextControlSelectionHighlightColor" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="TextControlButtonBackground" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="TextControlButtonBackgroundPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="TextControlButtonBackgroundPressed" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="TextControlButtonBorderBrush" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="TextControlButtonBorderBrushPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="TextControlButtonBorderBrushPressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="TextControlButtonForeground" ResourceKey="SystemControlForegroundChromeBlackMediumBrush" />
+    <StaticResource x:Key="TextControlButtonForegroundPointerOver" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="TextControlButtonForegroundPressed" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
+    <StaticResource x:Key="ContentLinkForegroundColor" ResourceKey="SystemControlHyperlinkTextBrush" />
+    <StaticResource x:Key="ContentLinkBackgroundColor" ResourceKey="SystemControlPageBackgroundChromeLowBrush" />
+
+    <!-- Resources for AutoCompleteBox.xaml -->
+    <StaticResource x:Key="AutoCompleteBoxLightDismissOverlayBackground" ResourceKey="SystemControlPageBackgroundMediumAltMediumBrush" />
+    <StaticResource x:Key="AutoCompleteBoxSuggestionsListBackground" ResourceKey="SystemControlBackgroundChromeMediumLowBrush" />
+    <StaticResource x:Key="AutoCompleteBoxSuggestionsListBorderBrush" ResourceKey="SystemControlForegroundChromeHighBrush" />
+    <x:Double x:Key="AutoCompleteBoxIconFontSize">12</x:Double>
 
     <!-- BaseResources for CheckBox.xaml -->
     <StaticResource x:Key="CheckBoxForegroundUnchecked" ResourceKey="SystemControlForegroundBaseHighBrush" />
@@ -159,25 +217,44 @@
     <StaticResource x:Key="CheckBoxCheckGlyphForegroundIndeterminatePointerOver" ResourceKey="SystemControlForegroundBaseHighBrush" />
     <StaticResource x:Key="CheckBoxCheckGlyphForegroundIndeterminatePressed" ResourceKey="SystemControlForegroundBaseMediumBrush" />
     <StaticResource x:Key="CheckBoxCheckGlyphForegroundIndeterminateDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
-
-    <!-- BaseResources for Listbox.xaml -->
-    <Thickness x:Key="ListBoxBorderThemeThickness">0</Thickness>
-    <SolidColorBrush x:Key="ListBoxBackgroundThemeBrush" Color="#CCFFFFFF" />
-    <SolidColorBrush x:Key="ListBoxBorderThemeBrush" Color="#45000000" />
-    <SolidColorBrush x:Key="ListBoxDisabledForegroundThemeBrush" Color="#66000000" />
-    <SolidColorBrush x:Key="ListBoxFocusBackgroundThemeBrush" Color="#FFFFFFFF" />
-    <SolidColorBrush x:Key="ListBoxForegroundThemeBrush" Color="#FF000000" />
-    <SolidColorBrush x:Key="ListBoxItemDisabledForegroundThemeBrush" Color="#66000000" />
-    <SolidColorBrush x:Key="ListBoxItemPointerOverBackgroundThemeBrush" Color="#21000000" />
-    <SolidColorBrush x:Key="ListBoxItemPointerOverForegroundThemeBrush" Color="#FF000000" />
-    <SolidColorBrush x:Key="ListBoxItemPressedBackgroundThemeBrush" Color="#FFD3D3D3" />
-    <SolidColorBrush x:Key="ListBoxItemPressedForegroundThemeBrush" Color="#FF000000" />
-    <SolidColorBrush x:Key="ListBoxItemSelectedBackgroundThemeBrush" Color="#FF4617B4" />
-    <SolidColorBrush x:Key="ListBoxItemSelectedDisabledBackgroundThemeBrush" Color="#8C000000" />
-    <SolidColorBrush x:Key="ListBoxItemSelectedDisabledForegroundThemeBrush" Color="#99FFFFFF" />
-    <SolidColorBrush x:Key="ListBoxItemSelectedForegroundThemeBrush" Color="White" />
-    <SolidColorBrush x:Key="ListBoxItemSelectedPointerOverBackgroundThemeBrush" Color="#FF5F37BE" />
-
+    
+    <!-- BaseResources for RadioButton.xaml -->
+    <StaticResource x:Key="RadioButtonForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="RadioButtonForegroundPointerOver" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="RadioButtonForegroundPressed" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="RadioButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="RadioButtonBackground" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonBackgroundPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonBackgroundPressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonBorderBrush" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonBorderBrushPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonBorderBrushPressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonBorderBrushDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseStroke" ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseStrokePointerOver" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseStrokePressed" ResourceKey="SystemControlHighlightBaseMediumBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseStrokeDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseFill" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseFillPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseFillPressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseFillDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseCheckedStroke" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseCheckedStrokePointerOver" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseCheckedStrokePressed" ResourceKey="SystemControlHighlightBaseMediumBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseCheckedStrokeDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseCheckedFill" ResourceKey="SystemControlHighlightAltTransparentBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseCheckedFillPointerOver" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseCheckedFillPressed" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseCheckedFillDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonCheckGlyphFill" ResourceKey="SystemControlHighlightBaseMediumHighBrush" />
+    <StaticResource x:Key="RadioButtonCheckGlyphFillPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+    <StaticResource x:Key="RadioButtonCheckGlyphFillPressed" ResourceKey="SystemControlHighlightAltBaseMediumBrush" />
+    <StaticResource x:Key="RadioButtonCheckGlyphFillDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="RadioButtonCheckGlyphStroke" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonCheckGlyphStrokePointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonCheckGlyphStrokePressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonCheckGlyphStrokeDisabled" ResourceKey="SystemControlTransparentBrush" />
     <!-- BaseResources for Slider.xaml -->
     <StaticResource x:Key="SliderContainerBackground" ResourceKey="SystemControlTransparentBrush" />
     <StaticResource x:Key="SliderContainerBackgroundPointerOver" ResourceKey="SystemControlTransparentBrush" />
@@ -200,37 +277,5 @@
     <StaticResource x:Key="SliderTickBarFill" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
     <StaticResource x:Key="SliderTickBarFillDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
     <StaticResource x:Key="SliderInlineTickBarFill" ResourceKey="SystemControlBackgroundAltHighBrush" />
-
-    <!-- BaseResources for TextBox.xaml -->
-    <StaticResource x:Key="TextControlForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
-    <StaticResource x:Key="TextControlForegroundPointerOver" ResourceKey="SystemControlForegroundBaseHighBrush" />
-    <StaticResource x:Key="TextControlForegroundFocused" ResourceKey="SystemControlForegroundChromeBlackHighBrush" />
-    <StaticResource x:Key="TextControlForegroundDisabled" ResourceKey="SystemControlDisabledChromeDisabledLowBrush" />
-    <StaticResource x:Key="TextControlBackground" ResourceKey="SystemControlBackgroundAltMediumLowBrush" />
-    <StaticResource x:Key="TextControlBackgroundPointerOver" ResourceKey="SystemControlBackgroundAltMediumBrush" />
-    <StaticResource x:Key="TextControlBackgroundFocused" ResourceKey="SystemControlBackgroundChromeWhiteBrush" />
-    <StaticResource x:Key="TextControlBackgroundDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
-    <StaticResource x:Key="TextControlBorderBrush" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
-    <StaticResource x:Key="TextControlBorderBrushPointerOver" ResourceKey="SystemControlHighlightBaseMediumBrush" />
-    <StaticResource x:Key="TextControlBorderBrushFocused" ResourceKey="SystemControlHighlightAccentBrush" />
-    <StaticResource x:Key="TextControlBorderBrushDisabled" ResourceKey="SystemControlDisabledBaseLowBrush" />
-    <StaticResource x:Key="TextControlPlaceholderForeground" ResourceKey="SystemControlPageTextBaseMediumBrush" />
-    <StaticResource x:Key="TextControlPlaceholderForegroundPointerOver" ResourceKey="SystemControlPageTextBaseMediumBrush" />
-    <StaticResource x:Key="TextControlPlaceholderForegroundFocused" ResourceKey="SystemControlPageTextChromeBlackMediumLowBrush" />
-    <StaticResource x:Key="TextControlPlaceholderForegroundDisabled" ResourceKey="SystemControlDisabledChromeDisabledLowBrush" />
-    <StaticResource x:Key="TextControlHeaderForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
-    <StaticResource x:Key="TextControlHeaderForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
-    <StaticResource x:Key="TextControlSelectionHighlightColor" ResourceKey="SystemControlHighlightAccentBrush" />
-    <StaticResource x:Key="TextControlButtonBackground" ResourceKey="SystemControlTransparentBrush" />
-    <StaticResource x:Key="TextControlButtonBackgroundPointerOver" ResourceKey="SystemControlTransparentBrush" />
-    <StaticResource x:Key="TextControlButtonBackgroundPressed" ResourceKey="SystemControlHighlightAccentBrush" />
-    <StaticResource x:Key="TextControlButtonBorderBrush" ResourceKey="SystemControlTransparentBrush" />
-    <StaticResource x:Key="TextControlButtonBorderBrushPointerOver" ResourceKey="SystemControlTransparentBrush" />
-    <StaticResource x:Key="TextControlButtonBorderBrushPressed" ResourceKey="SystemControlTransparentBrush" />
-    <StaticResource x:Key="TextControlButtonForeground" ResourceKey="SystemControlForegroundChromeBlackMediumBrush" />
-    <StaticResource x:Key="TextControlButtonForegroundPointerOver" ResourceKey="SystemControlHighlightAccentBrush" />
-    <StaticResource x:Key="TextControlButtonForegroundPressed" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
-    <StaticResource x:Key="ContentLinkForegroundColor" ResourceKey="SystemControlHyperlinkTextBrush" />
-    <StaticResource x:Key="ContentLinkBackgroundColor" ResourceKey="SystemControlPageBackgroundChromeLowBrush" />
   </Style.Resources>
 </Style>
diff --git a/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesDark.xaml b/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesDark.xaml
index b395e3983f..3a992a24f9 100644
--- a/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesDark.xaml
+++ b/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesDark.xaml
@@ -1,5 +1,5 @@
-<Style xmlns="https://github.com/avaloniaui"
-  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+<Style xmlns="https://github.com/avaloniaui" 
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
   xmlns:sys="clr-namespace:System;assembly=netstandard">
   <Style.Resources>
     <!-- Resources for Button.xaml -->
@@ -39,6 +39,55 @@
     <SolidColorBrush x:Key="ButtonPressedBackgroundThemeBrush" Color="#FFFFFFFF" />
     <SolidColorBrush x:Key="ButtonPressedForegroundThemeBrush" Color="#FF000000" />
 
+    <!-- Resources for ListBox.xaml -->
+    <Thickness x:Key="ListBoxBorderThemeThickness">0</Thickness>
+    <SolidColorBrush x:Key="ListBoxBackgroundThemeBrush" Color="#CCFFFFFF" />
+    <SolidColorBrush x:Key="ListBoxBorderThemeBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="ListBoxDisabledForegroundThemeBrush" Color="#66FFFFFF" />
+    <SolidColorBrush x:Key="ListBoxFocusBackgroundThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="ListBoxForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="ListBoxItemDisabledForegroundThemeBrush" Color="#66FFFFFF" />
+    <SolidColorBrush x:Key="ListBoxItemPointerOverBackgroundThemeBrush" Color="#21000000" />
+    <SolidColorBrush x:Key="ListBoxItemPointerOverForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="ListBoxItemPressedBackgroundThemeBrush" Color="#FFD3D3D3" />
+    <SolidColorBrush x:Key="ListBoxItemPressedForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="ListBoxItemSelectedBackgroundThemeBrush" Color="#FF4617B4" />
+    <SolidColorBrush x:Key="ListBoxItemSelectedDisabledBackgroundThemeBrush" Color="#66FFFFFF" />
+    <SolidColorBrush x:Key="ListBoxItemSelectedDisabledForegroundThemeBrush" Color="#99000000" />
+    <SolidColorBrush x:Key="ListBoxItemSelectedForegroundThemeBrush" Color="White" />
+    <SolidColorBrush x:Key="ListBoxItemSelectedPointerOverBackgroundThemeBrush" Color="#FF5F37BE" />
+
+    <!-- Resources for TextBox.xaml -->
+    <SolidColorBrush x:Key="TextBoxForegroundHeaderThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="TextBoxPlaceholderTextThemeBrush" Color="#AB000000" />
+    <SolidColorBrush x:Key="TextBoxBackgroundThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="TextBoxBorderThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="TextBoxButtonBackgroundThemeBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="TextBoxButtonBorderThemeBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="TextBoxButtonForegroundThemeBrush" Color="#99FFFFFF" />
+    <SolidColorBrush x:Key="TextBoxButtonPointerOverBackgroundThemeBrush" Color="#FFDEDEDE" />
+    <SolidColorBrush x:Key="TextBoxButtonPointerOverBorderThemeBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="TextBoxButtonPointerOverForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="TextBoxButtonPressedBackgroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="TextBoxButtonPressedBorderThemeBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="TextBoxButtonPressedForegroundThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="TextBoxDisabledBackgroundThemeBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="TextBoxDisabledBorderThemeBrush" Color="#66FFFFFF" />
+    <SolidColorBrush x:Key="TextBoxDisabledForegroundThemeBrush" Color="#FF666666" />
+    <SolidColorBrush x:Key="TextBoxForegroundThemeBrush" Color="#FF000000" />
+    <StaticResource x:Key="TextControlBackgroundFocused" ResourceKey="SystemControlBackgroundAltHighBrush" />
+    <StaticResource x:Key="TextControlBorderBrush" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <StaticResource x:Key="TextControlBorderBrushPointerOver" ResourceKey="SystemControlHighlightBaseMediumHighBrush" />
+    <StaticResource x:Key="TextControlButtonForeground" ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
+    <StaticResource x:Key="TextControlForegroundFocused" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="TextControlPlaceholderForegroundFocused" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
+
+    <!-- Resources for AutoCompleteBox.xaml -->
+    <StaticResource x:Key="AutoCompleteBoxSuggestionsListBackground" ResourceKey="SystemControlTransientBackgroundBrush" />
+    <StaticResource x:Key="AutoCompleteBoxSuggestionsListBorderBrush" ResourceKey="SystemControlTransientBorderBrush" />
+    <StaticResource x:Key="AutoCompleteBoxLightDismissOverlayBackground" ResourceKey="SystemControlPageBackgroundMediumAltMediumBrush" />
+    <x:Double x:Key="AutoCompleteBoxIconFontSize">12</x:Double>
+
     <!-- Resources for Checkbox.xaml -->
     <Thickness x:Key="CheckBoxBorderThemeThickness">1</Thickness>
     <Thickness x:Key="CheckBoxCheckedStrokeThickness">0</Thickness>
@@ -129,24 +178,59 @@
     <SolidColorBrush x:Key="CheckBoxPressedBorderThemeBrush" Color="#FFFFFFFF" />
     <SolidColorBrush x:Key="CheckBoxPressedForegroundThemeBrush" Color="#FF000000" />
 
-    <!-- Resources for ListBox.xaml -->
-    <Thickness x:Key="ListBoxBorderThemeThickness">0</Thickness>
-    <SolidColorBrush x:Key="ListBoxBackgroundThemeBrush" Color="#CCFFFFFF" />
-    <SolidColorBrush x:Key="ListBoxBorderThemeBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="ListBoxDisabledForegroundThemeBrush" Color="#66FFFFFF" />
-    <SolidColorBrush x:Key="ListBoxFocusBackgroundThemeBrush" Color="#FFFFFFFF" />
-    <SolidColorBrush x:Key="ListBoxForegroundThemeBrush" Color="#FF000000" />
-    <SolidColorBrush x:Key="ListBoxItemDisabledForegroundThemeBrush" Color="#66FFFFFF" />
-    <SolidColorBrush x:Key="ListBoxItemPointerOverBackgroundThemeBrush" Color="#21000000" />
-    <SolidColorBrush x:Key="ListBoxItemPointerOverForegroundThemeBrush" Color="#FF000000" />
-    <SolidColorBrush x:Key="ListBoxItemPressedBackgroundThemeBrush" Color="#FFD3D3D3" />
-    <SolidColorBrush x:Key="ListBoxItemPressedForegroundThemeBrush" Color="#FF000000" />
-    <SolidColorBrush x:Key="ListBoxItemSelectedBackgroundThemeBrush" Color="#FF4617B4" />
-    <SolidColorBrush x:Key="ListBoxItemSelectedDisabledBackgroundThemeBrush" Color="#66FFFFFF" />
-    <SolidColorBrush x:Key="ListBoxItemSelectedDisabledForegroundThemeBrush" Color="#99000000" />
-    <SolidColorBrush x:Key="ListBoxItemSelectedForegroundThemeBrush" Color="White" />
-    <SolidColorBrush x:Key="ListBoxItemSelectedPointerOverBackgroundThemeBrush" Color="#FF5F37BE" />
-
+    <!-- Resources for RadioButton.xaml -->
+    <x:Double x:Key="RadioButtonBorderThemeThickness">1</x:Double>
+    <StaticResource x:Key="RadioButtonForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="RadioButtonForegroundPointerOver" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="RadioButtonForegroundPressed" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="RadioButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="RadioButtonBackground" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonBackgroundPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonBackgroundPressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonBorderBrush" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonBorderBrushPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonBorderBrushPressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonBorderBrushDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseStroke" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseStrokePointerOver" ResourceKey="SystemControlHighlightBaseMediumHighBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseStrokePressed" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseStrokeDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseFill" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseFillPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseFillPressed" ResourceKey="SystemControlBackgroundBaseMediumLowBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseFillDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseCheckedStroke" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseCheckedStrokePointerOver" ResourceKey="SystemAccentColorLight1" />
+    <StaticResource x:Key="RadioButtonOuterEllipseCheckedStrokePressed" ResourceKey="SystemAccentColorDark1" />
+    <StaticResource x:Key="RadioButtonOuterEllipseCheckedStrokeDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseCheckedFill" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseCheckedFillPointerOver" ResourceKey="SystemAccentColorLight1" />
+    <StaticResource x:Key="RadioButtonOuterEllipseCheckedFillPressed" ResourceKey="SystemAccentColorDark1" />
+    <StaticResource x:Key="RadioButtonOuterEllipseCheckedFillDisabled" ResourceKey="SystemControlBackgroundBaseMediumLowBrush" />
+    <StaticResource x:Key="RadioButtonCheckGlyphFill" ResourceKey="SystemControlForegroundChromeWhiteBrush" />
+    <StaticResource x:Key="RadioButtonCheckGlyphFillPointerOver" ResourceKey="SystemControlForegroundChromeWhiteBrush" />
+    <StaticResource x:Key="RadioButtonCheckGlyphFillPressed" ResourceKey="SystemControlForegroundChromeWhiteBrush" />
+    <StaticResource x:Key="RadioButtonCheckGlyphFillDisabled" ResourceKey="SystemControlForegroundChromeWhiteBrush" />
+    <StaticResource x:Key="RadioButtonCheckGlyphStroke" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonCheckGlyphStrokePointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonCheckGlyphStrokePressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonCheckGlyphStrokeDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <SolidColorBrush x:Key="RadioButtonBackgroundThemeBrush" Color="#CCFFFFFF" />
+    <SolidColorBrush x:Key="RadioButtonBorderThemeBrush" Color="#CCFFFFFF" />
+    <SolidColorBrush x:Key="RadioButtonContentDisabledForegroundThemeBrush" Color="#66FFFFFF" />
+    <SolidColorBrush x:Key="RadioButtonContentForegroundThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="RadioButtonDisabledBackgroundThemeBrush" Color="#66FFFFFF" />
+    <SolidColorBrush x:Key="RadioButtonDisabledBorderThemeBrush" Color="#66FFFFFF" />
+    <SolidColorBrush x:Key="RadioButtonDisabledForegroundThemeBrush" Color="#66000000" />
+    <SolidColorBrush x:Key="RadioButtonForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="RadioButtonPointerOverBackgroundThemeBrush" Color="#DEFFFFFF" />
+    <SolidColorBrush x:Key="RadioButtonPointerOverBorderThemeBrush" Color="#DEFFFFFF" />
+    <SolidColorBrush x:Key="RadioButtonPointerOverForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="RadioButtonPressedBackgroundThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="RadioButtonPressedBorderThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="RadioButtonPressedForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="RadioButtonContentPointerOverForegroundThemeBrush" Color="{DynamicResource SystemColorHighlightTextColor}" />
     <!-- Resources for Slider.xaml -->
     <x:Double x:Key="SliderOutsideTickBarThemeHeight">4</x:Double>
     <x:Double x:Key="SliderTrackThemeHeight">2</x:Double>
@@ -196,30 +280,5 @@
     <SolidColorBrush x:Key="SliderTrackPointerOverBackgroundThemeBrush" Color="#46FFFFFF" />
     <SolidColorBrush x:Key="SliderTrackPressedBackgroundThemeBrush" Color="#59FFFFFF" />
     <SolidColorBrush x:Key="SliderHeaderForegroundThemeBrush" Color="#FFFFFFFF" />
-
-    <!-- Resources for TextBox.xaml -->
-    <SolidColorBrush x:Key="TextBoxForegroundHeaderThemeBrush" Color="#FFFFFFFF" />
-    <SolidColorBrush x:Key="TextBoxPlaceholderTextThemeBrush" Color="#AB000000" />
-    <SolidColorBrush x:Key="TextBoxBackgroundThemeBrush" Color="#FFFFFFFF" />
-    <SolidColorBrush x:Key="TextBoxBorderThemeBrush" Color="#FFFFFFFF" />
-    <SolidColorBrush x:Key="TextBoxButtonBackgroundThemeBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="TextBoxButtonBorderThemeBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="TextBoxButtonForegroundThemeBrush" Color="#99FFFFFF" />
-    <SolidColorBrush x:Key="TextBoxButtonPointerOverBackgroundThemeBrush" Color="#FFDEDEDE" />
-    <SolidColorBrush x:Key="TextBoxButtonPointerOverBorderThemeBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="TextBoxButtonPointerOverForegroundThemeBrush" Color="#FF000000" />
-    <SolidColorBrush x:Key="TextBoxButtonPressedBackgroundThemeBrush" Color="#FF000000" />
-    <SolidColorBrush x:Key="TextBoxButtonPressedBorderThemeBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="TextBoxButtonPressedForegroundThemeBrush" Color="#FFFFFFFF" />
-    <SolidColorBrush x:Key="TextBoxDisabledBackgroundThemeBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="TextBoxDisabledBorderThemeBrush" Color="#66FFFFFF" />
-    <SolidColorBrush x:Key="TextBoxDisabledForegroundThemeBrush" Color="#FF666666" />
-    <SolidColorBrush x:Key="TextBoxForegroundThemeBrush" Color="#FF000000" />
-    <StaticResource x:Key="TextControlBackgroundFocused" ResourceKey="SystemControlBackgroundAltHighBrush" />
-    <StaticResource x:Key="TextControlBorderBrush" ResourceKey="SystemControlForegroundBaseMediumBrush" />
-    <StaticResource x:Key="TextControlBorderBrushPointerOver" ResourceKey="SystemControlHighlightBaseMediumHighBrush" />
-    <StaticResource x:Key="TextControlButtonForeground" ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
-    <StaticResource x:Key="TextControlForegroundFocused" ResourceKey="SystemControlForegroundBaseHighBrush" />
-    <StaticResource x:Key="TextControlPlaceholderForegroundFocused" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
   </Style.Resources>
 </Style>
diff --git a/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesLight.xaml b/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesLight.xaml
index e1cc0302c7..575c3b33ae 100644
--- a/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesLight.xaml
+++ b/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesLight.xaml
@@ -1,5 +1,5 @@
-<Style xmlns="https://github.com/avaloniaui"
-  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+<Style xmlns="https://github.com/avaloniaui" 
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
   xmlns:sys="clr-namespace:System;assembly=netstandard">
   <Style.Resources>
     <!-- Resources for Button.xaml -->
@@ -39,6 +39,55 @@
     <SolidColorBrush x:Key="ButtonPressedBackgroundThemeBrush" Color="#FF000000" />
     <SolidColorBrush x:Key="ButtonPressedForegroundThemeBrush" Color="#FFFFFFFF" />
 
+    <!-- Resources for ListBox.xaml -->
+    <Thickness x:Key="ListBoxBorderThemeThickness">0</Thickness>
+    <SolidColorBrush x:Key="ListBoxBackgroundThemeBrush" Color="#CCFFFFFF" />
+    <SolidColorBrush x:Key="ListBoxBorderThemeBrush" Color="#45000000" />
+    <SolidColorBrush x:Key="ListBoxDisabledForegroundThemeBrush" Color="#66000000" />
+    <SolidColorBrush x:Key="ListBoxFocusBackgroundThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="ListBoxForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="ListBoxItemDisabledForegroundThemeBrush" Color="#66000000" />
+    <SolidColorBrush x:Key="ListBoxItemPointerOverBackgroundThemeBrush" Color="#21000000" />
+    <SolidColorBrush x:Key="ListBoxItemPointerOverForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="ListBoxItemPressedBackgroundThemeBrush" Color="#FFD3D3D3" />
+    <SolidColorBrush x:Key="ListBoxItemPressedForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="ListBoxItemSelectedBackgroundThemeBrush" Color="#FF4617B4" />
+    <SolidColorBrush x:Key="ListBoxItemSelectedDisabledBackgroundThemeBrush" Color="#8C000000" />
+    <SolidColorBrush x:Key="ListBoxItemSelectedDisabledForegroundThemeBrush" Color="#99FFFFFF" />
+    <SolidColorBrush x:Key="ListBoxItemSelectedForegroundThemeBrush" Color="White" />
+    <SolidColorBrush x:Key="ListBoxItemSelectedPointerOverBackgroundThemeBrush" Color="#FF5F37BE" />
+
+    <!-- Resources for TextBox.xaml -->
+    <SolidColorBrush x:Key="TextBoxForegroundHeaderThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="TextBoxPlaceholderTextThemeBrush" Color="#AB000000" />
+    <SolidColorBrush x:Key="TextBoxBackgroundThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="TextBoxBorderThemeBrush" Color="#A3000000" />
+    <SolidColorBrush x:Key="TextBoxButtonBackgroundThemeBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="TextBoxButtonBorderThemeBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="TextBoxButtonForegroundThemeBrush" Color="#99000000" />
+    <SolidColorBrush x:Key="TextBoxButtonPointerOverBackgroundThemeBrush" Color="#FFDEDEDE" />
+    <SolidColorBrush x:Key="TextBoxButtonPointerOverBorderThemeBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="TextBoxButtonPointerOverForegroundThemeBrush" Color="Black" />
+    <SolidColorBrush x:Key="TextBoxButtonPressedBackgroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="TextBoxButtonPressedBorderThemeBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="TextBoxButtonPressedForegroundThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="TextBoxDisabledBackgroundThemeBrush" Color="#66CACACA" />
+    <SolidColorBrush x:Key="TextBoxDisabledBorderThemeBrush" Color="#26000000" />
+    <SolidColorBrush x:Key="TextBoxDisabledForegroundThemeBrush" Color="#FF666666" />
+    <SolidColorBrush x:Key="TextBoxForegroundThemeBrush" Color="#FF000000" />
+    <StaticResource x:Key="TextControlBackgroundFocused" ResourceKey="SystemControlBackgroundAltHighBrush" />
+    <StaticResource x:Key="TextControlBorderBrush" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <StaticResource x:Key="TextControlBorderBrushPointerOver" ResourceKey="SystemControlHighlightBaseMediumHighBrush" />
+    <StaticResource x:Key="TextControlButtonForeground" ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
+    <StaticResource x:Key="TextControlForegroundFocused" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="TextControlPlaceholderForegroundFocused" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
+
+    <!-- Resources for AutoCompleteBox.xaml -->
+    <StaticResource x:Key="AutoCompleteBoxSuggestionsListBackground" ResourceKey="SystemControlTransientBackgroundBrush" />
+    <StaticResource x:Key="AutoCompleteBoxSuggestionsListBorderBrush" ResourceKey="SystemControlTransientBorderBrush" />
+    <StaticResource x:Key="AutoCompleteBoxLightDismissOverlayBackground" ResourceKey="SystemControlPageBackgroundMediumAltMediumBrush" />
+    <x:Double x:Key="AutoCompleteBoxIconFontSize">12</x:Double>
+
     <!-- Resources for CheckBox.xaml -->
     <x:Double x:Key="CheckBoxBorderThemeThickness">1</x:Double>
     <x:Double x:Key="CheckBoxCheckedStrokeThickness">0</x:Double>
@@ -129,24 +178,59 @@
     <SolidColorBrush x:Key="CheckBoxPressedBorderThemeBrush" Color="#FF000000" />
     <SolidColorBrush x:Key="CheckBoxPressedForegroundThemeBrush" Color="#FFFFFFFF" />
 
-    <!-- Resources for ListBox.xaml -->
-    <Thickness x:Key="ListBoxBorderThemeThickness">0</Thickness>
-    <SolidColorBrush x:Key="ListBoxBackgroundThemeBrush" Color="#CCFFFFFF" />
-    <SolidColorBrush x:Key="ListBoxBorderThemeBrush" Color="#45000000" />
-    <SolidColorBrush x:Key="ListBoxDisabledForegroundThemeBrush" Color="#66000000" />
-    <SolidColorBrush x:Key="ListBoxFocusBackgroundThemeBrush" Color="#FFFFFFFF" />
-    <SolidColorBrush x:Key="ListBoxForegroundThemeBrush" Color="#FF000000" />
-    <SolidColorBrush x:Key="ListBoxItemDisabledForegroundThemeBrush" Color="#66000000" />
-    <SolidColorBrush x:Key="ListBoxItemPointerOverBackgroundThemeBrush" Color="#21000000" />
-    <SolidColorBrush x:Key="ListBoxItemPointerOverForegroundThemeBrush" Color="#FF000000" />
-    <SolidColorBrush x:Key="ListBoxItemPressedBackgroundThemeBrush" Color="#FFD3D3D3" />
-    <SolidColorBrush x:Key="ListBoxItemPressedForegroundThemeBrush" Color="#FF000000" />
-    <SolidColorBrush x:Key="ListBoxItemSelectedBackgroundThemeBrush" Color="#FF4617B4" />
-    <SolidColorBrush x:Key="ListBoxItemSelectedDisabledBackgroundThemeBrush" Color="#8C000000" />
-    <SolidColorBrush x:Key="ListBoxItemSelectedDisabledForegroundThemeBrush" Color="#99FFFFFF" />
-    <SolidColorBrush x:Key="ListBoxItemSelectedForegroundThemeBrush" Color="White" />
-    <SolidColorBrush x:Key="ListBoxItemSelectedPointerOverBackgroundThemeBrush" Color="#FF5F37BE" />
-
+    <!-- Resources for RadioButton.xaml -->
+    <x:Double x:Key="RadioButtonBorderThemeThickness">1</x:Double>
+    <StaticResource x:Key="RadioButtonForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="RadioButtonForegroundPointerOver" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="RadioButtonForegroundPressed" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <StaticResource x:Key="RadioButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="RadioButtonBackground" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonBackgroundPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonBackgroundPressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonBorderBrush" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonBorderBrushPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonBorderBrushPressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonBorderBrushDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseStroke" ResourceKey="SystemControlForegroundBaseMediumBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseStrokePointerOver" ResourceKey="SystemControlHighlightBaseMediumHighBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseStrokePressed" ResourceKey="SystemControlHighlightBaseHighBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseStrokeDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseFill" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseFillPointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseFillPressed" ResourceKey="SystemControlBackgroundBaseMediumLowBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseFillDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseCheckedStroke" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseCheckedStrokePointerOver" ResourceKey="SystemAccentColorLight1" />
+    <StaticResource x:Key="RadioButtonOuterEllipseCheckedStrokePressed" ResourceKey="SystemAccentColorDark1" />
+    <StaticResource x:Key="RadioButtonOuterEllipseCheckedStrokeDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseCheckedFill" ResourceKey="SystemControlHighlightAccentBrush" />
+    <StaticResource x:Key="RadioButtonOuterEllipseCheckedFillPointerOver" ResourceKey="SystemAccentColorLight1" />
+    <StaticResource x:Key="RadioButtonOuterEllipseCheckedFillPressed" ResourceKey="SystemAccentColorDark1" />
+    <StaticResource x:Key="RadioButtonOuterEllipseCheckedFillDisabled" ResourceKey="SystemControlBackgroundBaseMediumLowBrush" />
+    <StaticResource x:Key="RadioButtonCheckGlyphFill" ResourceKey="SystemControlForegroundChromeWhiteBrush" />
+    <StaticResource x:Key="RadioButtonCheckGlyphFillPointerOver" ResourceKey="SystemControlForegroundChromeWhiteBrush" />
+    <StaticResource x:Key="RadioButtonCheckGlyphFillPressed" ResourceKey="SystemControlForegroundChromeWhiteBrush" />
+    <StaticResource x:Key="RadioButtonCheckGlyphFillDisabled" ResourceKey="SystemControlForegroundChromeWhiteBrush" />
+    <StaticResource x:Key="RadioButtonCheckGlyphStroke" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonCheckGlyphStrokePointerOver" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonCheckGlyphStrokePressed" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="RadioButtonCheckGlyphStrokeDisabled" ResourceKey="SystemControlTransparentBrush" />
+    <SolidColorBrush x:Key="RadioButtonBackgroundThemeBrush" Color="#CCFFFFFF" />
+    <SolidColorBrush x:Key="RadioButtonBorderThemeBrush" Color="#45000000" />
+    <SolidColorBrush x:Key="RadioButtonContentDisabledForegroundThemeBrush" Color="#66000000" />
+    <SolidColorBrush x:Key="RadioButtonContentForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="RadioButtonDisabledBackgroundThemeBrush" Color="#66CACACA" />
+    <SolidColorBrush x:Key="RadioButtonDisabledBorderThemeBrush" Color="#26000000" />
+    <SolidColorBrush x:Key="RadioButtonDisabledForegroundThemeBrush" Color="#66000000" />
+    <SolidColorBrush x:Key="RadioButtonForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="RadioButtonPointerOverBackgroundThemeBrush" Color="#DEFFFFFF" />
+    <SolidColorBrush x:Key="RadioButtonPointerOverBorderThemeBrush" Color="#70000000" />
+    <SolidColorBrush x:Key="RadioButtonPointerOverForegroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="RadioButtonPressedBackgroundThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="RadioButtonPressedBorderThemeBrush" Color="#FF000000" />
+    <SolidColorBrush x:Key="RadioButtonPressedForegroundThemeBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="RadioButtonContentPointerOverForegroundThemeBrush" Color="{DynamicResource SystemColorHighlightTextColor}" />
     <!-- Resources for Slider.xaml -->
     <x:Double x:Key="SliderOutsideTickBarThemeHeight">4</x:Double>
     <x:Double x:Key="SliderTrackThemeHeight">2</x:Double>
@@ -196,30 +280,5 @@
     <SolidColorBrush x:Key="SliderTrackPointerOverBackgroundThemeBrush" Color="#26000000" />
     <SolidColorBrush x:Key="SliderTrackPressedBackgroundThemeBrush" Color="#33000000" />
     <SolidColorBrush x:Key="SliderHeaderForegroundThemeBrush" Color="#FF000000" />
-
-    <!-- Resources for TextBox.xaml -->
-    <SolidColorBrush x:Key="TextBoxForegroundHeaderThemeBrush" Color="#FF000000" />
-    <SolidColorBrush x:Key="TextBoxPlaceholderTextThemeBrush" Color="#AB000000" />
-    <SolidColorBrush x:Key="TextBoxBackgroundThemeBrush" Color="#FFFFFFFF" />
-    <SolidColorBrush x:Key="TextBoxBorderThemeBrush" Color="#A3000000" />
-    <SolidColorBrush x:Key="TextBoxButtonBackgroundThemeBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="TextBoxButtonBorderThemeBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="TextBoxButtonForegroundThemeBrush" Color="#99000000" />
-    <SolidColorBrush x:Key="TextBoxButtonPointerOverBackgroundThemeBrush" Color="#FFDEDEDE" />
-    <SolidColorBrush x:Key="TextBoxButtonPointerOverBorderThemeBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="TextBoxButtonPointerOverForegroundThemeBrush" Color="Black" />
-    <SolidColorBrush x:Key="TextBoxButtonPressedBackgroundThemeBrush" Color="#FF000000" />
-    <SolidColorBrush x:Key="TextBoxButtonPressedBorderThemeBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="TextBoxButtonPressedForegroundThemeBrush" Color="#FFFFFFFF" />
-    <SolidColorBrush x:Key="TextBoxDisabledBackgroundThemeBrush" Color="#66CACACA" />
-    <SolidColorBrush x:Key="TextBoxDisabledBorderThemeBrush" Color="#26000000" />
-    <SolidColorBrush x:Key="TextBoxDisabledForegroundThemeBrush" Color="#FF666666" />
-    <SolidColorBrush x:Key="TextBoxForegroundThemeBrush" Color="#FF000000" />
-    <StaticResource x:Key="TextControlBackgroundFocused" ResourceKey="SystemControlBackgroundAltHighBrush" />
-    <StaticResource x:Key="TextControlBorderBrush" ResourceKey="SystemControlForegroundBaseMediumBrush" />
-    <StaticResource x:Key="TextControlBorderBrushPointerOver" ResourceKey="SystemControlHighlightBaseMediumHighBrush" />
-    <StaticResource x:Key="TextControlButtonForeground" ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
-    <StaticResource x:Key="TextControlForegroundFocused" ResourceKey="SystemControlForegroundBaseHighBrush" />
-    <StaticResource x:Key="TextControlPlaceholderForegroundFocused" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
   </Style.Resources>
 </Style>
diff --git a/src/Avalonia.Themes.Fluent/AutoCompleteBox.xaml b/src/Avalonia.Themes.Fluent/AutoCompleteBox.xaml
index 788b60892b..52bacdb36e 100644
--- a/src/Avalonia.Themes.Fluent/AutoCompleteBox.xaml
+++ b/src/Avalonia.Themes.Fluent/AutoCompleteBox.xaml
@@ -1,37 +1,69 @@
-<Styles xmlns="https://github.com/avaloniaui">
+<Styles xmlns="https://github.com/avaloniaui" 
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <Design.PreviewWith>
+    <Border Padding="20">
+      <AutoCompleteBox Width="200">
+        <AutoCompleteBox.Items>
+          Alabama
+          Alaska
+          Arizona
+          Arkansas
+          California
+          Colorado
+          Connecticut
+          Delaware
+        </AutoCompleteBox.Items>
+      </AutoCompleteBox>
+    </Border>
+  </Design.PreviewWith>
+
   <Style Selector="AutoCompleteBox">
-    <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}"/>
-    <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}"/>
-    <Setter Property="Padding" Value="4"/>
+    <Setter Property="VerticalAlignment" Value="Top" />
+    <Setter Property="Foreground" Value="{DynamicResource TextControlForeground}" />
+    <Setter Property="Background" Value="{DynamicResource TextControlBackground}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource TextControlBorderBrush}" />
+    <Setter Property="BorderThickness" Value="{DynamicResource TextControlBorderThemeThickness}" />
+    <Setter Property="FontFamily" Value="{DynamicResource ContentControlThemeFontFamily}" />
+    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+    <Setter Property="Padding" Value="{DynamicResource TextControlThemePadding}" />
     <Setter Property="Template">
       <ControlTemplate>
-        <Panel>
+        <Grid Name="PART_LayoutRoot">
           <TextBox Name="PART_TextBox"
-                   Background="{TemplateBinding Background}" 
-                   BorderBrush="{TemplateBinding BorderBrush}" 
+                   Watermark="{TemplateBinding Watermark}"
+                   Width="{TemplateBinding Width}"
+                   Foreground="{TemplateBinding Foreground}"
+                   Background="{TemplateBinding Background}"
+                   BorderBrush="{TemplateBinding BorderBrush}"
                    BorderThickness="{TemplateBinding BorderThickness}"
+                   FontSize="{TemplateBinding FontSize}"
+                   FontFamily="{TemplateBinding FontFamily}"
+                   FontWeight="{TemplateBinding FontWeight}"
                    Padding="{TemplateBinding Padding}"
-                   Watermark="{TemplateBinding Watermark}"
+                   Margin="0"
                    DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}" />
           
           <Popup Name="PART_Popup"
+                 WindowManagerAddShadowHint="False"
                  MinWidth="{Binding Bounds.Width, RelativeSource={RelativeSource TemplatedParent}}"
                  MaxHeight="{TemplateBinding MaxDropDownHeight}"
-                 PlacementTarget="{TemplateBinding}"
-                 StaysOpen="False">
-            <Border BorderBrush="{DynamicResource ThemeBorderMidBrush}"
-                    BorderThickness="1">
+                 StaysOpen="False"                 
+                 PlacementTarget="{TemplateBinding}">            
+            <Border Name="PART_SuggestionsContainer"
+                    Padding="{DynamicResource AutoCompleteListMargin}"
+                    BorderThickness="{DynamicResource AutoCompleteListBorderThemeThickness}"
+                    BorderBrush="{DynamicResource AutoSuggestBoxSuggestionsListBorderBrush}"
+                    Background="{DynamicResource AutoCompleteBoxSuggestionsListBackground}"
+                    CornerRadius="{DynamicResource OverlayCornerRadius}">
               <ListBox Name="PART_SelectingItemsControl"
                        BorderThickness="0"
-                       Background="{TemplateBinding Background}"
-                       Foreground="{TemplateBinding Foreground}"
+                       Background="Transparent"
+                       Foreground="{DynamicResource AutoCompleteBoxSuggestionsListForeground}"
                        ItemTemplate="{TemplateBinding ItemTemplate}"
-                       ScrollViewer.HorizontalScrollBarVisibility="Auto"
-                       ScrollViewer.VerticalScrollBarVisibility="Auto" />
+                       Margin="{DynamicResource AutoCompleteListPadding}" />
             </Border>
           </Popup>
-        </Panel>
+        </Grid>
       </ControlTemplate>
     </Setter>
   </Style>
diff --git a/src/Avalonia.Themes.Fluent/PopupRoot.xaml b/src/Avalonia.Themes.Fluent/PopupRoot.xaml
index 9af4f5a910..25c71e3493 100644
--- a/src/Avalonia.Themes.Fluent/PopupRoot.xaml
+++ b/src/Avalonia.Themes.Fluent/PopupRoot.xaml
@@ -1,17 +1,21 @@
-<Style xmlns="https://github.com/avaloniaui" Selector="PopupRoot">
-  <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}"/>
-  <Setter Property="Template">
-    <ControlTemplate>
-      <Panel>
-        <Border Name="PART_TransparencyFallback" IsHitTestVisible="False" />
-        <VisualLayerManager IsPopup="True">
-          <ContentPresenter Name="PART_ContentPresenter"
-                            Background="{TemplateBinding Background}"
-                            ContentTemplate="{TemplateBinding ContentTemplate}"
-                            Content="{TemplateBinding Content}"
-                            Padding="{TemplateBinding Padding}"/>
-        </VisualLayerManager>
-      </Panel>
-    </ControlTemplate>
-  </Setter>
-</Style>
+<Styles xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <Style Selector="PopupRoot">
+    <Setter Property="TransparencyLevelHint" Value="Transparent" />
+    <Setter Property="Background" Value="{x:Null}" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Panel>
+          <Border Name="PART_TransparencyFallback" IsHitTestVisible="False" />
+          <VisualLayerManager IsPopup="True">
+            <ContentPresenter Name="PART_ContentPresenter"
+                              Background="{TemplateBinding Background}"
+                              ContentTemplate="{TemplateBinding ContentTemplate}"
+                              Content="{TemplateBinding Content}"
+                              Padding="{TemplateBinding Padding}"/>
+          </VisualLayerManager>
+        </Panel>
+      </ControlTemplate>
+    </Setter>
+  </Style>
+</Styles>
diff --git a/src/Avalonia.Themes.Fluent/RadioButton.xaml b/src/Avalonia.Themes.Fluent/RadioButton.xaml
index 4cdb116cdd..23bcfc616a 100644
--- a/src/Avalonia.Themes.Fluent/RadioButton.xaml
+++ b/src/Avalonia.Themes.Fluent/RadioButton.xaml
@@ -1,60 +1,173 @@
 <Styles xmlns="https://github.com/avaloniaui">
+  <Design.PreviewWith>
+    <Border Padding="20">
+      <StackPanel Spacing="10">
+        <RadioButton Content="Option 1" />
+        <RadioButton Content="Option 2" />
+        <RadioButton IsEnabled="False" Content="Option 3" />
+        <RadioButton Content="Option 2" />
+      </StackPanel>
+    </Border>
+  </Design.PreviewWith>
   <Style Selector="RadioButton">
-    <Setter Property="Background" Value="Transparent"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}"/>
-    <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}"/>
+    <Setter Property="Background" Value="{DynamicResource RadioButtonBackground}" />
+    <Setter Property="Foreground" Value="{DynamicResource RadioButtonForeground}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource RadioButtonBorderBrush}" />
+    <Setter Property="Padding" Value="8,6,0,0" />
+    <Setter Property="HorizontalAlignment" Value="Left" />
+    <Setter Property="VerticalAlignment" Value="Center" />
+    <Setter Property="HorizontalContentAlignment" Value="Left" />
+    <Setter Property="VerticalContentAlignment" Value="Top" />
+    <Setter Property="FontFamily" Value="{DynamicResource ContentControlThemeFontFamily}" />
+    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+    <Setter Property="MinWidth" Value="120" />
     <Setter Property="Template">
-      <ControlTemplate>
-        <Grid ColumnDefinitions="Auto,*" Background="{TemplateBinding Background}">
-          <Ellipse Name="border"
-                   Stroke="{TemplateBinding BorderBrush}"
-                   StrokeThickness="1"
-                   Width="18"
-                   Height="18"
-                   VerticalAlignment="Center"/>
-          <Ellipse Name="checkMark"
-                   Width="10"
-                   Height="10"
-                   Stretch="Uniform"
-                   UseLayoutRounding="False"
-                   HorizontalAlignment="Center"
-                   VerticalAlignment="Center"/>
-          <Ellipse Name="indeterminateMark"
-                   Fill="{DynamicResource ThemeAccentBrush}"
-                   Width="10"
-                   Height="10"
-                   Stretch="Uniform"
-                   UseLayoutRounding="False"
-                   HorizontalAlignment="Center"
-                   VerticalAlignment="Center"/>
-          <ContentPresenter Name="PART_ContentPresenter"
-                            ContentTemplate="{TemplateBinding ContentTemplate}"
-                            Content="{TemplateBinding Content}"
-                            Margin="4,0,0,0"
-                            VerticalAlignment="Center"
-                            Grid.Column="1"/>
-        </Grid>
+      <ControlTemplate TargetType="RadioButton">
+        <Border Name="RootBorder"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{DynamicResource ControlCornerRadius}">
+          <Grid ColumnDefinitions="20,*">
+            <Grid VerticalAlignment="Top"
+              Height="32">
+
+              <Ellipse Name="OuterEllipse"
+                       Width="20" Height="20"
+                       UseLayoutRounding="False"
+                       StrokeThickness="{DynamicResource RadioButtonBorderThemeThickness}" />
+
+              <Ellipse Name="CheckOuterEllipse"
+                       Width="20" Height="20"
+                       UseLayoutRounding="False"
+                       StrokeThickness="{DynamicResource RadioButtonBorderThemeThickness}" />
+
+              <Ellipse Name="CheckGlyph"
+                       Width="8" Height="8"
+                       UseLayoutRounding="False" />
+            </Grid>
+
+            <ContentPresenter Name="PART_ContentPresenter"
+                              Content="{TemplateBinding Content}"
+                              ContentTemplate="{TemplateBinding ContentTemplate}"
+                              TextBlock.Foreground="{TemplateBinding Foreground}"
+                              Margin="{TemplateBinding Padding}"
+                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                              Grid.Column="1" />
+          </Grid>
+        </Border>
       </ControlTemplate>
     </Setter>
   </Style>
-  
-  <Style Selector="RadioButton:pointerover /template/ Ellipse#border">
-    <Setter Property="Stroke" Value="{DynamicResource ThemeBorderHighBrush}"/>
+
+  <!-- Normal State -->
+  <Style Selector="RadioButton /template/ Ellipse#OuterEllipse">
+    <Setter Property="Stroke" Value="{DynamicResource RadioButtonOuterEllipseStroke}" />
+    <Setter Property="Fill" Value="{DynamicResource RadioButtonOuterEllipseFill}" />
   </Style>
-  <Style Selector="RadioButton /template/ Ellipse#checkMark">
-    <Setter Property="Fill" Value="{DynamicResource HighlightBrush}"/>
-    <Setter Property="IsVisible" Value="False"/>
+
+  <Style Selector="RadioButton /template/ Ellipse#CheckOuterEllipse">
+    <Setter Property="Stroke" Value="{DynamicResource RadioButtonOuterEllipseCheckedStroke}" />
+    <Setter Property="Fill" Value="{DynamicResource RadioButtonOuterEllipseCheckedFill}" />
+    <Setter Property="Opacity" Value="0" />
   </Style>
-  <Style Selector="RadioButton /template/ Ellipse#indeterminateMark">
-    <Setter Property="IsVisible" Value="False"/>
+
+  <Style Selector="RadioButton /template/ Ellipse#CheckGlyph">
+    <Setter Property="Opacity" Value="0" />
+    <Setter Property="Stroke" Value="{DynamicResource RadioButtonCheckGlyphStroke}" />
+    <Setter Property="Fill" Value="{DynamicResource RadioButtonCheckGlyphFill}" />
   </Style>
-  <Style Selector="RadioButton:checked /template/ Ellipse#checkMark">
-    <Setter Property="IsVisible" Value="True"/>
+
+
+  <!-- PointerOver State -->
+  <Style Selector="RadioButton:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+    <Setter Property="(TextBlock.Foreground)" Value="{DynamicResource RadioButtonForegroundPointerOver}" />
   </Style>
-  <Style Selector="RadioButton:indeterminate /template/ Ellipse#indeterminateMark">
-    <Setter Property="IsVisible" Value="True"/>
+
+  <Style Selector="RadioButton:pointerover /template/ Border#RootBorder">
+    <Setter Property="Background" Value="{DynamicResource RadioButtonBackgroundPointerOver}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource RadioButtonBorderBrushPointerOver}" />
   </Style>
-  <Style Selector="RadioButton:disabled /template/ Ellipse#border">
-    <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}"/>
+
+  <Style Selector="RadioButton:pointerover /template/ Ellipse#OuterEllipse">
+    <Setter Property="Stroke" Value="{DynamicResource RadioButtonOuterEllipseStrokePointerOver}" />
+    <Setter Property="Fill" Value="{DynamicResource RadioButtonOuterEllipseFillPointerOver}" />
+  </Style>
+
+  <Style Selector="RadioButton:pointerover /template/ Ellipse#CheckOuterEllipse">
+    <Setter Property="Stroke" Value="{DynamicResource RadioButtonOuterEllipseCheckedStrokePointerOver}" />
+    <Setter Property="Fill" Value="{DynamicResource RadioButtonOuterEllipseCheckedFillPointerOver}" />
+  </Style>
+
+  <Style Selector="RadioButton:pointerover /template/ Ellipse#CheckGlyph">
+    <Setter Property="Stroke" Value="{DynamicResource RadioButtonCheckGlyphStrokePointerOver}" />
+    <Setter Property="Fill" Value="{DynamicResource RadioButtonCheckGlyphFillPointerOver}" />
+  </Style>
+
+
+  <!-- Pressed State -->
+  <Style Selector="RadioButton:pressed /template/ ContentPresenter#PART_ContentPresenter">
+    <Setter Property="(TextBlock.Foreground)" Value="{DynamicResource RadioButtonForegroundPressed}" />
+  </Style>
+
+  <Style Selector="RadioButton:pressed /template/ Border#RootBorder">
+    <Setter Property="Background" Value="{DynamicResource RadioButtonBackgroundPressed}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource RadioButtonBorderBrushPressed}" />
+  </Style>
+
+  <Style Selector="RadioButton:pressed /template/ Ellipse#OuterEllipse">
+    <Setter Property="Stroke" Value="{DynamicResource RadioButtonOuterEllipseStrokePressed}" />
+    <Setter Property="Fill" Value="{DynamicResource RadioButtonOuterEllipseFillPressed}" />
+  </Style>
+
+  <Style Selector="RadioButton:pressed /template/ Ellipse#CheckOuterEllipse">
+    <Setter Property="Stroke" Value="{DynamicResource RadioButtonOuterEllipseCheckedStrokePressed}" />
+    <Setter Property="Fill" Value="{DynamicResource RadioButtonOuterEllipseCheckedFillPressed}" />
+  </Style>
+
+  <Style Selector="RadioButton:pressed /template/ Ellipse#CheckGlyph">
+    <Setter Property="Stroke" Value="{DynamicResource RadioButtonCheckGlyphStrokePressed}" />
+    <Setter Property="Fill" Value="{DynamicResource RadioButtonCheckGlyphFillPressed}" />
+  </Style>
+
+
+  <!-- Disabled State -->
+  <Style Selector="RadioButton:disabled /template/ ContentPresenter#PART_ContentPresenter">
+    <Setter Property="(TextBlock.Foreground)" Value="{DynamicResource RadioButtonForegroundDisabled}" />
+  </Style>
+
+  <Style Selector="RadioButton:disabled /template/ Border#RootBorder">
+    <Setter Property="Background" Value="{DynamicResource RadioButtonBackgroundDisabled}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource RadioButtonBorderBrushDisabled}" />
+  </Style>
+
+  <Style Selector="RadioButton:disabled /template/ Ellipse#OuterEllipse">
+    <Setter Property="Stroke" Value="{DynamicResource RadioButtonOuterEllipseStrokeDisabled}" />
+    <Setter Property="Fill" Value="{DynamicResource RadioButtonOuterEllipseFillDisabled}" />
+  </Style>
+
+  <Style Selector="RadioButton:disabled /template/ Ellipse#CheckOuterEllipse">
+    <Setter Property="Stroke" Value="{DynamicResource RadioButtonOuterEllipseCheckedStrokeDisabled}" />
+    <Setter Property="Fill" Value="{DynamicResource RadioButtonOuterEllipseCheckedFillDisabled}" />
+  </Style>
+
+  <Style Selector="RadioButton:disabled /template/ Ellipse#CheckGlyph">
+    <Setter Property="Stroke" Value="{DynamicResource RadioButtonCheckGlyphFillDisabled}" />
+    <Setter Property="Fill" Value="{DynamicResource RadioButtonCheckGlyphStrokeDisabled}" />
+  </Style>
+
+
+  <!-- Checked State -->
+  <Style Selector="RadioButton:checked /template/ Ellipse#CheckGlyph">
+    <Setter Property="Opacity" Value="1" />
+  </Style>
+
+  <Style Selector="RadioButton:checked /template/ Ellipse#OuterEllipse">
+    <Setter Property="Opacity" Value="0" />
+  </Style>
+
+  <Style Selector="RadioButton:checked /template/ Ellipse#CheckOuterEllipse">
+    <Setter Property="Opacity" Value="1" />
   </Style>
 </Styles>
diff --git a/src/Avalonia.Themes.Fluent/Slider.xaml b/src/Avalonia.Themes.Fluent/Slider.xaml
index fff8525ebd..07dc318961 100644
--- a/src/Avalonia.Themes.Fluent/Slider.xaml
+++ b/src/Avalonia.Themes.Fluent/Slider.xaml
@@ -48,9 +48,9 @@
       <ControlTemplate>
         <Border BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="{DynamicResource ControlCornerRadius}">
           <Grid Name="grid" Margin="{TemplateBinding Padding}" RowDefinitions="Auto, *">
-            <ContentPresenter Name="HeaderContentPresenter" Grid.Row="0" TextBlock.FontWeight="{DynamicResource SliderHeaderThemeFontWeight}" TextBlock.Foreground="{DynamicResource SliderHeaderForeground}" Margin="{DynamicResource SliderTopHeaderMargin}" />
-            <Grid Name="SliderContainer" Grid.Row="1">
-              <Grid Name="HorizontalTemplate" ColumnDefinitions="Auto,Auto,*" MinHeight="{DynamicResource SliderHorizontalHeight}">
+            <ContentPresenter x:Name="HeaderContentPresenter" Grid.Row="0" TextBlock.FontWeight="{DynamicResource SliderHeaderThemeFontWeight}" TextBlock.Foreground="{DynamicResource SliderHeaderForeground}" Margin="{DynamicResource SliderTopHeaderMargin}" />
+            <Grid x:Name="SliderContainer" Grid.Row="1">
+              <Grid x:Name="HorizontalTemplate" ColumnDefinitions="Auto,Auto,*" MinHeight="{DynamicResource SliderHorizontalHeight}">
 
                 <Grid.RowDefinitions>
                   <RowDefinition Height="{DynamicResource SliderPreContentMargin}" />
@@ -109,9 +109,9 @@
       <ControlTemplate>
         <Border BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="{DynamicResource ControlCornerRadius}">
           <Grid Name="grid" Margin="{TemplateBinding Padding}" RowDefinitions="Auto, *">
-            <ContentPresenter Name="HeaderContentPresenter" Grid.Row="0" TextBlock.FontWeight="{DynamicResource SliderHeaderThemeFontWeight}" TextBlock.Foreground="{DynamicResource SliderHeaderForeground}" Margin="{DynamicResource SliderTopHeaderMargin}" />
-            <Grid Name="SliderContainer" Grid.Row="1">
-              <Grid Name="VerticalTemplate" RowDefinitions="*,Auto,Auto" MinWidth="{DynamicResource SliderVerticalWidth}">
+            <ContentPresenter x:Name="HeaderContentPresenter" Grid.Row="0" TextBlock.FontWeight="{DynamicResource SliderHeaderThemeFontWeight}" TextBlock.Foreground="{DynamicResource SliderHeaderForeground}" Margin="{DynamicResource SliderTopHeaderMargin}" />
+            <Grid x:Name="SliderContainer" Grid.Row="1">
+              <Grid x:Name="VerticalTemplate" RowDefinitions="*,Auto,Auto" MinWidth="{DynamicResource SliderVerticalWidth}">
 
                 <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="{DynamicResource SliderPreContentMargin}" />
diff --git a/src/Avalonia.X11/X11Window.cs b/src/Avalonia.X11/X11Window.cs
index 4899f0efc0..1d41fe4bdd 100644
--- a/src/Avalonia.X11/X11Window.cs
+++ b/src/Avalonia.X11/X11Window.cs
@@ -1098,6 +1098,10 @@ namespace Avalonia.X11
         public void SetTransparencyLevelHint(WindowTransparencyLevel transparencyLevel) =>
             _transparencyHelper.SetTransparencyRequest(transparencyLevel);
 
+        public void SetWindowManagerAddShadowHint(bool enabled)
+        {
+        }
+
         public WindowTransparencyLevel TransparencyLevel => _transparencyHelper.CurrentLevel;
     }
 }
diff --git a/src/Windows/Avalonia.Win32/PopupImpl.cs b/src/Windows/Avalonia.Win32/PopupImpl.cs
index 504cefb9b3..efcf1ea674 100644
--- a/src/Windows/Avalonia.Win32/PopupImpl.cs
+++ b/src/Windows/Avalonia.Win32/PopupImpl.cs
@@ -7,6 +7,8 @@ namespace Avalonia.Win32
 {
     class PopupImpl : WindowImpl, IPopupImpl
     {
+        private bool _dropShadowHint = true;
+
         public override void Show()
         {
             UnmanagedMethods.ShowWindow(Handle.Handle, UnmanagedMethods.ShowWindowCommand.ShowNoActivate);
@@ -36,11 +38,7 @@ namespace Avalonia.Win32
                 IntPtr.Zero,
                 IntPtr.Zero);
 
-            var classes = (int)UnmanagedMethods.GetClassLongPtr(result, (int)UnmanagedMethods.ClassLongIndex.GCL_STYLE);
-
-            classes |= (int)UnmanagedMethods.ClassStyles.CS_DROPSHADOW;
-
-            UnmanagedMethods.SetClassLong(result, UnmanagedMethods.ClassLongIndex.GCL_STYLE, new IntPtr(classes));
+            EnableBoxShadow(result, _dropShadowHint);
 
             return result;
         }
@@ -68,6 +66,32 @@ namespace Avalonia.Win32
             //TODO: We ignore the scaling override for now
         }
 
+        private void EnableBoxShadow (IntPtr hwnd, bool enabled)
+        {
+            var classes = (int)UnmanagedMethods.GetClassLongPtr(hwnd, (int)UnmanagedMethods.ClassLongIndex.GCL_STYLE);
+
+            if (enabled)
+            {
+                classes |= (int)UnmanagedMethods.ClassStyles.CS_DROPSHADOW;
+            }
+            else
+            {
+                classes &= ~(int)UnmanagedMethods.ClassStyles.CS_DROPSHADOW;
+            }
+
+            UnmanagedMethods.SetClassLong(hwnd, UnmanagedMethods.ClassLongIndex.GCL_STYLE, new IntPtr(classes));
+        }
+
+        public void SetWindowManagerAddShadowHint(bool enabled)
+        {
+            _dropShadowHint = enabled;
+
+            if (Handle != null)
+            {
+                EnableBoxShadow(Handle.Handle, enabled);
+            }
+        }
+
         public IPopupPositioner PopupPositioner { get; }
     }
 }
diff --git a/tests/Avalonia.Controls.UnitTests/Mixins/PressedMixinTests.cs b/tests/Avalonia.Controls.UnitTests/Mixins/PressedMixinTests.cs
new file mode 100644
index 0000000000..0ff1f40121
--- /dev/null
+++ b/tests/Avalonia.Controls.UnitTests/Mixins/PressedMixinTests.cs
@@ -0,0 +1,37 @@
+using Avalonia.Controls.Mixins;
+using Avalonia.UnitTests;
+using Xunit;
+
+namespace Avalonia.Controls.UnitTests.Mixins
+{
+    public class PressedMixinTests
+    {
+        private MouseTestHelper _mouse = new MouseTestHelper();
+
+        [Fact]
+        public void Selected_Class_Should_Not_Initially_Be_Added()
+        {
+            var target = new TestControl();
+
+            Assert.Empty(target.Classes);
+        }
+
+        [Fact]
+        public void Setting_IsSelected_Should_Add_Selected_Class()
+        {
+            var target = new TestControl();
+
+            _mouse.Down(target);
+
+            Assert.Equal(new[] { ":pressed" }, target.Classes);
+        }
+
+        private class TestControl : Control
+        {
+            static TestControl()
+            {
+                PressedMixin.Attach<TestControl>();
+            }
+        }
+    }
+}

From a43b080e36d8f10bec77abd7ce956a05cc1a62a6 Mon Sep 17 00:00:00 2001
From: Jumar Macato <hikari.netto23@gmail.com>
Date: Sat, 30 May 2020 19:16:14 +0800
Subject: [PATCH 31/45] add TickBar styles back

---
 src/Avalonia.Themes.Fluent/Slider.xaml | 44 ++++++++++++++++++++++----
 1 file changed, 38 insertions(+), 6 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Slider.xaml b/src/Avalonia.Themes.Fluent/Slider.xaml
index 75f64952ed..ac6ecf419a 100644
--- a/src/Avalonia.Themes.Fluent/Slider.xaml
+++ b/src/Avalonia.Themes.Fluent/Slider.xaml
@@ -58,11 +58,11 @@
                   <RowDefinition Height="{DynamicResource SliderPostContentMargin}" />
                 </Grid.RowDefinitions>
 
-                <TickBar Name="TopTickBar" Placement="Top" Fill="{DynamicResource SliderTickBarFill}" Height="{DynamicResource SliderOutsideTickBarThemeHeight}" VerticalAlignment="Bottom" Margin="0,0,0,4" Grid.ColumnSpan="3" />
+                <TickBar Name="TopTickBar" Placement="Top" Height="{DynamicResource SliderOutsideTickBarThemeHeight}" VerticalAlignment="Bottom" Margin="0,0,0,4" Grid.ColumnSpan="3" />
                 
-                <TickBar Name="HorizontalInlineTickBar" Placement="Top" Fill="{DynamicResource SliderInlineTickBarFill}" Height="{DynamicResource SliderTrackThemeHeight}" Grid.Row="1" Grid.ColumnSpan="3" />
+                <!-- <TickBar Name="HorizontalInlineTickBar" Placement="Top" Fill="{DynamicResource SliderInlineTickBarFill}" Height="{DynamicResource SliderTrackThemeHeight}" Grid.Row="1" Grid.ColumnSpan="3" /> -->
                 
-                <TickBar Name="BottomTickBar" Placement="Bottom" Fill="{DynamicResource SliderTickBarFill}" Height="{DynamicResource SliderOutsideTickBarThemeHeight}" VerticalAlignment="Top" Margin="0,4,0,0" Grid.Row="2" Grid.ColumnSpan="3" />
+                <TickBar Name="BottomTickBar" Placement="Bottom" Height="{DynamicResource SliderOutsideTickBarThemeHeight}" VerticalAlignment="Top" Margin="0,4,0,0" Grid.Row="2" Grid.ColumnSpan="3" />
 
                 <Track Name="PART_Track" Grid.Row="1" Grid.ColumnSpan="3" Orientation="Horizontal">
                   <Track.DecreaseButton>
@@ -119,11 +119,11 @@
                   <ColumnDefinition Width="{DynamicResource SliderPostContentMargin}" />
                 </Grid.ColumnDefinitions>
  
-                <TickBar Name="LeftTickBar" Placement="Left" Fill="{DynamicResource SliderTickBarFill}" Width="{DynamicResource SliderOutsideTickBarThemeHeight}" HorizontalAlignment="Right" Margin="0,0,4,0" Grid.RowSpan="3" />
+                <TickBar Name="LeftTickBar" Placement="Left" Width="{DynamicResource SliderOutsideTickBarThemeHeight}" HorizontalAlignment="Right" Margin="0,0,4,0" Grid.RowSpan="3" />
                 
-                <TickBar Name="VerticalInlineTickBar" Placement="Left" Fill="{DynamicResource SliderInlineTickBarFill}" Width="{DynamicResource SliderTrackThemeHeight}" Grid.Column="1" Grid.RowSpan="3" />
+                <!-- <TickBar Name="VerticalInlineTickBar" Placement="Left" Fill="{DynamicResource SliderInlineTickBarFill}" Width="{DynamicResource SliderTrackThemeHeight}" Grid.Column="1" Grid.RowSpan="3" /> -->
 
-                <TickBar Name="RightTickBar" Placement="Right" Fill="{DynamicResource SliderTickBarFill}" Width="{DynamicResource SliderOutsideTickBarThemeHeight}" HorizontalAlignment="Left" Margin="4,0,0,0" Grid.Column="2" Grid.RowSpan="3" /> 
+                <TickBar Name="RightTickBar" Placement="Right" Width="{DynamicResource SliderOutsideTickBarThemeHeight}" HorizontalAlignment="Left" Margin="4,0,0,0" Grid.Column="2" Grid.RowSpan="3" /> 
 
                 <Track Name="PART_Track" Grid.Column="1" Grid.ColumnSpan="1" Grid.RowSpan="3" Orientation="Vertical">
                   <Track.DecreaseButton>
@@ -175,6 +175,22 @@
     <Setter Property="Background" Value="{DynamicResource SliderContainerBackground}" />
   </Style>
 
+  <Style Selector="Slider /template/ TickBar#TopTickBar">
+    <Setter Property="Background" Value="{DynamicResource SliderTickBarFill}" />
+  </Style>
+
+  <Style Selector="Slider /template/ TickBar#BottomTickBar">
+    <Setter Property="Background" Value="{DynamicResource SliderTickBarFill}" />
+  </Style>
+
+  <Style Selector="Slider /template/ TickBar#LeftTickBar">
+    <Setter Property="Background" Value="{DynamicResource SliderTickBarFill}" />
+  </Style>
+
+  <Style Selector="Slider /template/ TickBar#RightTickBar">
+    <Setter Property="Background" Value="{DynamicResource SliderTickBarFill}" />
+  </Style>
+
   <!-- Disabled State -->
   <Style Selector="Slider:disabled /template/ ContentPresenter#HeaderContentPresenter">
     <Setter Property="TextBlock.Foreground" Value="{DynamicResource SliderHeaderForegroundDisabled}" />
@@ -192,6 +208,22 @@
     <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundDisabled}" />
   </Style>
 
+  <Style Selector="Slider:disabled /template/ TickBar#TopTickBar">
+    <Setter Property="Background" Value="{DynamicResource SliderTickBarFillDisabled}" />
+  </Style>
+
+  <Style Selector="Slider:disabled /template/ TickBar#BottomTickBar">
+    <Setter Property="Background" Value="{DynamicResource SliderTickBarFillDisabled}" />
+  </Style>
+
+  <Style Selector="Slider:disabled /template/ TickBar#LeftTickBar">
+    <Setter Property="Background" Value="{DynamicResource SliderTickBarFillDisabled}" />
+  </Style>
+
+  <Style Selector="Slider:disabled /template/ TickBar#RightTickBar">
+    <Setter Property="Background" Value="{DynamicResource SliderTickBarFillDisabled}" />
+  </Style>
+
   <Style Selector="Slider:pointerover /template/ Grid#SliderContainer">
     <Setter Property="Background" Value="{DynamicResource SliderContainerBackgroundDisabled}" />
   </Style>

From abe3914258aad5cc7cd4b97bd619761830f0584b Mon Sep 17 00:00:00 2001
From: Jumar Macato <hikari.netto23@gmail.com>
Date: Sat, 30 May 2020 19:22:57 +0800
Subject: [PATCH 32/45] fix tickbar fill

---
 src/Avalonia.Themes.Fluent/Slider.xaml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Slider.xaml b/src/Avalonia.Themes.Fluent/Slider.xaml
index ac6ecf419a..77b5f9568d 100644
--- a/src/Avalonia.Themes.Fluent/Slider.xaml
+++ b/src/Avalonia.Themes.Fluent/Slider.xaml
@@ -176,19 +176,19 @@
   </Style>
 
   <Style Selector="Slider /template/ TickBar#TopTickBar">
-    <Setter Property="Background" Value="{DynamicResource SliderTickBarFill}" />
+    <Setter Property="Fill" Value="{DynamicResource SliderTickBarFill}" />
   </Style>
 
   <Style Selector="Slider /template/ TickBar#BottomTickBar">
-    <Setter Property="Background" Value="{DynamicResource SliderTickBarFill}" />
+    <Setter Property="Fill" Value="{DynamicResource SliderTickBarFill}" />
   </Style>
 
   <Style Selector="Slider /template/ TickBar#LeftTickBar">
-    <Setter Property="Background" Value="{DynamicResource SliderTickBarFill}" />
+    <Setter Property="Fill" Value="{DynamicResource SliderTickBarFill}" />
   </Style>
 
   <Style Selector="Slider /template/ TickBar#RightTickBar">
-    <Setter Property="Background" Value="{DynamicResource SliderTickBarFill}" />
+    <Setter Property="Fill" Value="{DynamicResource SliderTickBarFill}" />
   </Style>
 
   <!-- Disabled State -->
@@ -209,19 +209,19 @@
   </Style>
 
   <Style Selector="Slider:disabled /template/ TickBar#TopTickBar">
-    <Setter Property="Background" Value="{DynamicResource SliderTickBarFillDisabled}" />
+    <Setter Property="Fill" Value="{DynamicResource SliderTickBarFillDisabled}" />
   </Style>
 
   <Style Selector="Slider:disabled /template/ TickBar#BottomTickBar">
-    <Setter Property="Background" Value="{DynamicResource SliderTickBarFillDisabled}" />
+    <Setter Property="Fill" Value="{DynamicResource SliderTickBarFillDisabled}" />
   </Style>
 
   <Style Selector="Slider:disabled /template/ TickBar#LeftTickBar">
-    <Setter Property="Background" Value="{DynamicResource SliderTickBarFillDisabled}" />
+    <Setter Property="Fill" Value="{DynamicResource SliderTickBarFillDisabled}" />
   </Style>
 
   <Style Selector="Slider:disabled /template/ TickBar#RightTickBar">
-    <Setter Property="Background" Value="{DynamicResource SliderTickBarFillDisabled}" />
+    <Setter Property="Fill" Value="{DynamicResource SliderTickBarFillDisabled}" />
   </Style>
 
   <Style Selector="Slider:pointerover /template/ Grid#SliderContainer">

From 3a91bae6f0eef16795618c074808f4b06a3d21c3 Mon Sep 17 00:00:00 2001
From: Jumar Macato <hikari.netto23@gmail.com>
Date: Sat, 30 May 2020 20:14:38 +0800
Subject: [PATCH 33/45] cleanup and move binding to slider itself

---
 src/Avalonia.Controls/Slider.cs  |  22 +++-
 src/Avalonia.Controls/TickBar.cs | 192 ++-----------------------------
 2 files changed, 28 insertions(+), 186 deletions(-)

diff --git a/src/Avalonia.Controls/Slider.cs b/src/Avalonia.Controls/Slider.cs
index 2db7c5cb83..33810cdcec 100644
--- a/src/Avalonia.Controls/Slider.cs
+++ b/src/Avalonia.Controls/Slider.cs
@@ -44,7 +44,7 @@ namespace Avalonia.Controls
             OrientationProperty.OverrideDefaultValue(typeof(Slider), Orientation.Horizontal);
             Thumb.DragStartedEvent.AddClassHandler<Slider>((x, e) => x.OnThumbDragStarted(e), RoutingStrategies.Bubble);
             Thumb.DragDeltaEvent.AddClassHandler<Slider>((x, e) => x.OnThumbDragDelta(e), RoutingStrategies.Bubble);
-            Thumb.DragCompletedEvent.AddClassHandler<Slider>((x, e) => x.OnThumbDragCompleted(e), RoutingStrategies.Bubble);            
+            Thumb.DragCompletedEvent.AddClassHandler<Slider>((x, e) => x.OnThumbDragCompleted(e), RoutingStrategies.Bubble);
         }
 
         /// <summary>
@@ -96,9 +96,15 @@ namespace Avalonia.Controls
             }
 
             _decreaseButton = e.NameScope.Find<Button>("PART_DecreaseButton");
-            _track = e.NameScope.Find<Track>("PART_Track");        
+            _track = e.NameScope.Find<Track>("PART_Track");
             _increaseButton = e.NameScope.Find<Button>("PART_IncreaseButton");
 
+            AttachTickBar(e.NameScope.Find<TickBar>("TopTickBar"));
+            AttachTickBar(e.NameScope.Find<TickBar>("BottomTickBar"));
+
+            AttachTickBar(e.NameScope.Find<TickBar>("LeftTickBar"));
+            AttachTickBar(e.NameScope.Find<TickBar>("RightTickBar"));
+
             if (_decreaseButton != null)
             {
                 _decreaseButton.Click += DecreaseClick;
@@ -110,6 +116,18 @@ namespace Avalonia.Controls
             }
         }
 
+        private void AttachTickBar(TickBar tickBar)
+        {
+            if (tickBar is null)
+                return;
+
+            tickBar[~TickBar.TickFrequencyProperty] = this[~TickFrequencyProperty];
+            tickBar[~TickBar.OrientationProperty] = this[~Slider.OrientationProperty];
+            tickBar[~TickBar.MinimumProperty] = this[~Slider.MinimumProperty];
+            tickBar[~TickBar.MaximumProperty] = this[~Slider.MaximumProperty];
+            tickBar[~TickBar.ReservedSpaceProperty] = _track.Thumb[~BoundsProperty];
+        }
+
         private void DecreaseClick(object sender, RoutedEventArgs e)
         {
             ChangeValueBy(-LargeChange);
diff --git a/src/Avalonia.Controls/TickBar.cs b/src/Avalonia.Controls/TickBar.cs
index 1cf98bd169..e174ac9681 100644
--- a/src/Avalonia.Controls/TickBar.cs
+++ b/src/Avalonia.Controls/TickBar.cs
@@ -45,7 +45,11 @@ namespace Avalonia.Controls
     {
         static TickBar()
         {
-            AffectsRender<TickBar>(ReservedSpaceProperty, MaximumProperty, MinimumProperty, OrientationProperty, TickFrequencyProperty);
+            AffectsRender<TickBar>(ReservedSpaceProperty,
+                                   MaximumProperty,
+                                   MinimumProperty,
+                                   OrientationProperty,
+                                   TickFrequencyProperty);
         }
 
         public TickBar() : base()
@@ -82,7 +86,6 @@ namespace Avalonia.Controls
             set { SetValue(MinimumProperty, value); }
         }
 
-
         /// <summary>
         /// Defines the <see cref="Maximum"/> property.
         /// </summary>
@@ -97,54 +100,7 @@ namespace Avalonia.Controls
             get { return GetValue(MaximumProperty); }
             set { SetValue(MaximumProperty, value); }
         }
-
-/*
-        /// <summary>
-        /// Defines the <see cref="SelectionStart"/> property.
-        /// </summary>
-        public static readonly StyledProperty<double> SelectionStartProperty =
-            AvaloniaProperty.Register<TickBar, double>(nameof(SelectionStart), 0d);
-
-        /// <summary>
-        /// Logical position where the SelectionStart Tick will be drawn
-        /// </summary>
-        public double SelectionStart
-        {
-            get { return GetValue(SelectionStartProperty); }
-            set { SetValue(SelectionStartProperty, value); }
-        }
-
-        /// <summary>
-        /// Defines the <see cref="SelectionEnd"/> property.
-        /// </summary>
-        public static readonly StyledProperty<double> SelectionEndProperty =
-            AvaloniaProperty.Register<TickBar, double>(nameof(SelectionEnd), 0d);
-
-        /// <summary>
-        /// Logical position where the SelectionEnd Tick will be drawn
-        /// </summary>
-        public double SelectionEnd
-        {
-            get { return GetValue(SelectionEndProperty); }
-            set { SetValue(SelectionEndProperty, value); }
-        }
-
-        /// <summary>
-        /// Defines the <see cref="IsSelectionRangeEnabled"/> property.
-        /// </summary>
-        public static readonly StyledProperty<bool> IsSelectionRangeEnabledProperty =
-            AvaloniaProperty.Register<TickBar, bool>(nameof(IsSelectionRangeEnabled));
-
-        /// <summary>
-        /// IsSelectionRangeEnabled specifies whether to draw SelectionStart Tick and SelectionEnd Tick or not.
-        /// </summary>
-        public bool IsSelectionRangeEnabled
-        {
-            get { return GetValue(IsSelectionRangeEnabledProperty); }
-            set { SetValue(IsSelectionRangeEnabledProperty, value); }
-        }
-*/
-
+ 
         /// <summary>
         /// Defines the <see cref="TickFrequency"/> property.
         /// </summary>
@@ -228,15 +184,6 @@ namespace Avalonia.Controls
             set { SetValue(PlacementProperty, value); }
         }
 
-        private static bool IsValidTickBarPlacement(object o)
-        {
-            TickBarPlacement placement = (TickBarPlacement)o;
-            return placement == TickBarPlacement.Left ||
-                   placement == TickBarPlacement.Top ||
-                   placement == TickBarPlacement.Right ||
-                   placement == TickBarPlacement.Bottom;
-        }
-
         /// <summary>
         /// Defines the <see cref="ReservedSpace"/> property.
         /// </summary>
@@ -255,7 +202,6 @@ namespace Avalonia.Controls
             set { SetValue(ReservedSpaceProperty, value); }
         }
 
-
         /// <summary>
         /// Draw ticks.
         /// Ticks can be draw in 8 diffrent ways depends on Placment property and IsDirectionReversed property.
@@ -360,9 +306,6 @@ namespace Avalonia.Controls
             }
 
             var pen = new Pen(Fill, 1.0d);
-            bool snapsToDevicePixels = UseLayoutRounding;
-            // var xLines = snapsToDevicePixels ? new List<double>() : null;
-            // var yLines = snapsToDevicePixels ? new List<double>() : null;
 
             // Is it Vertical?
             if ((Placement == TickBarPlacement.Left) || (Placement == TickBarPlacement.Right))
@@ -383,15 +326,6 @@ namespace Avalonia.Controls
                 dc.DrawLine(pen, new Point(startPoint.X, endPoint.Y),
                                  new Point(startPoint.X + tickLen, endPoint.Y));
 
-                // if (snapsToDevicePixels)
-                // {
-                //     xLines.Add(startPoint.X);
-                //     yLines.Add(startPoint.Y - 0.5);
-                //     xLines.Add(startPoint.X + tickLen);
-                //     yLines.Add(endPoint.Y - 0.5);
-                //     xLines.Add(startPoint.X + tickLen2);
-                // }
-
                 // This property is rarely set so let's try to avoid the GetValue
                 // caching of the mutable default value
                 var ticks = Ticks ?? null;
@@ -401,7 +335,7 @@ namespace Avalonia.Controls
                 {
                     for (int i = 0; i < ticks.Count; i++)
                     {
-                        if (MathUtilities.LessThanOrClose(ticks[i],Minimum) || MathUtilities.GreaterThanOrClose(ticks[i],Maximum))
+                        if (MathUtilities.LessThanOrClose(ticks[i], Minimum) || MathUtilities.GreaterThanOrClose(ticks[i], Maximum))
                         {
                             continue;
                         }
@@ -412,11 +346,6 @@ namespace Avalonia.Controls
                         dc.DrawLine(pen,
                             new Point(startPoint.X, y),
                             new Point(startPoint.X + tickLen2, y));
-
-                        // if (snapsToDevicePixels)
-                        // {
-                        //     yLines.Add(y - 0.5);
-                        // }
                     }
                 }
                 // Draw ticks using specified TickFrequency
@@ -429,42 +358,8 @@ namespace Avalonia.Controls
                         dc.DrawLine(pen,
                             new Point(startPoint.X, y),
                             new Point(startPoint.X + tickLen2, y));
-
-                        // if (snapsToDevicePixels)
-                        // {
-                        //     yLines.Add(y - 0.5);
-                        // }
                     }
                 }
-
-                // Draw Selection Ticks
-                // if (IsSelectionRangeEnabled)
-                // {
-                    // double y0 = (SelectionStart - Minimum) * logicalToPhysical + startPoint.Y;
-                    // Point pt0 = new Point(startPoint.X, y0);
-                    // Point pt1 = new Point(startPoint.X + tickLen2, y0);
-                    // Point pt2 = new Point(startPoint.X + tickLen2, y0 + Math.Abs(tickLen2) * progression);
-
-                    // PathSegment[] segments = new PathSegment[] {
-                    //     new LineSegment(pt2, true),
-                    //     new LineSegment(pt0, true),
-                    // };
-                    // PathGeometry geo = new PathGeometry(new PathFigure[] { new PathFigure(pt1, segments, true) });
-
-                    // dc.DrawGeometry(Fill, pen, geo);
-
-                    // y0 = (SelectionEnd - Minimum) * logicalToPhysical + startPoint.Y;
-                    // pt0 = new Point(startPoint.X, y0);
-                    // pt1 = new Point(startPoint.X + tickLen2, y0);
-                    // pt2 = new Point(startPoint.X + tickLen2, y0 - Math.Abs(tickLen2) * progression);
-
-                    // segments = new PathSegment[] {
-                    //     new LineSegment(pt2, true),
-                    //     new LineSegment(pt0, true),
-                    // };
-                    // geo = new PathGeometry(new PathFigure[] { new PathFigure(pt1, segments, true) });
-                    // dc.DrawGeometry(Fill, pen, geo);
-                // }
             }
             else  // Placement == Top || Placement == Bottom
             {
@@ -484,15 +379,6 @@ namespace Avalonia.Controls
                 dc.DrawLine(pen, new Point(endPoint.X, startPoint.Y),
                                  new Point(endPoint.X, startPoint.Y + tickLen));
 
-                // if (snapsToDevicePixels)
-                // {
-                //     xLines.Add(startPoint.X - 0.5);
-                //     yLines.Add(startPoint.Y);
-                //     xLines.Add(startPoint.X - 0.5);
-                //     yLines.Add(endPoint.Y + tickLen);
-                //     yLines.Add(endPoint.Y + tickLen2);
-                // }
-
                 // This property is rarely set so let's try to avoid the GetValue
                 // caching of the mutable default value
                 var ticks = Ticks ?? null;
@@ -502,7 +388,7 @@ namespace Avalonia.Controls
                 {
                     for (int i = 0; i < ticks.Count; i++)
                     {
-                        if (MathUtilities.LessThanOrClose(ticks[i],Minimum) || MathUtilities.GreaterThanOrClose(ticks[i],Maximum))
+                        if (MathUtilities.LessThanOrClose(ticks[i], Minimum) || MathUtilities.GreaterThanOrClose(ticks[i], Maximum))
                         {
                             continue;
                         }
@@ -512,11 +398,6 @@ namespace Avalonia.Controls
                         dc.DrawLine(pen,
                             new Point(x, startPoint.Y),
                             new Point(x, startPoint.Y + tickLen2));
-
-                        // if (snapsToDevicePixels)
-                        // {
-                        //     xLines.Add(x - 0.5);
-                        // }
                     }
                 }
                 // Draw ticks using specified TickFrequency
@@ -528,65 +409,8 @@ namespace Avalonia.Controls
                         dc.DrawLine(pen,
                             new Point(x, startPoint.Y),
                             new Point(x, startPoint.Y + tickLen2));
-
-                        // if (snapsToDevicePixels)
-                        // {
-                        //     xLines.Add(x - 0.5);
-                        // }
                     }
                 }
-
-                // Draw Selection Ticks
-                // if (IsSelectionRangeEnabled)
-                // {
-                //     double x0 = (SelectionStart - Minimum) * logicalToPhysical + startPoint.X;
-                //     Point pt0 = new Point(x0, startPoint.Y);
-                //     Point pt1 = new Point(x0, startPoint.Y + tickLen2);
-                //     Point pt2 = new Point(x0 + Math.Abs(tickLen2) * progression, startPoint.Y + tickLen2);
-
-                //     PathSegment[] segments = new PathSegment[] {
-                //         new LineSegment(pt2, true),
-                //         new LineSegment(pt0, true),
-                //     };
-                //     PathGeometry geo = new PathGeometry(new PathFigure[] { new PathFigure(pt1, segments, true) });
-
-                //     dc.DrawGeometry(Fill, pen, geo);
-
-                //     x0 = (SelectionEnd - Minimum) * logicalToPhysical + startPoint.X;
-                //     pt0 = new Point(x0, startPoint.Y);
-                //     pt1 = new Point(x0, startPoint.Y + tickLen2);
-                //     pt2 = new Point(x0 - Math.Abs(tickLen2) * progression, startPoint.Y + tickLen2);
-
-                //     segments = new PathSegment[] {
-                //         new LineSegment(pt2, true),
-                //         new LineSegment(pt0, true),
-                //     };
-                //     geo = new PathGeometry(new PathFigure[] { new PathFigure(pt1, segments, true) });
-                //     dc.DrawGeometry(Fill, pen, geo);
-                // }
-            }
-
-            // if (snapsToDevicePixels)
-            // {
-            //     xLines.Add(Bounds.Width);
-            //     yLines.Add(Bounds.Height);
-            //     VisualXSnappingGuidelines = xLines;
-            //     VisualYSnappingGuidelines = yLines;
-            // }
-        }
-        protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
-        {
-            if (TemplatedParent is Slider parent)
-            {
-                this[~TickFrequencyProperty] = parent[~Slider.TickFrequencyProperty];
-                this[~OrientationProperty] = parent[~Slider.OrientationProperty];
-                this[~MinimumProperty] = parent[~Slider.MinimumProperty];
-                this[~MaximumProperty] = parent[~Slider.MaximumProperty];
-
-                // if (parent._track != null)
-                // {
-                ReservedSpace = new Rect(0, 0, 20, 20); // HACK parent._track.Thumb[~BoundsProperty];
-                // }
             }
         }
     }

From c5fe3b5c40d3494bf640a58c0aa9f8143021179f Mon Sep 17 00:00:00 2001
From: Jumar Macato <hikari.netto23@gmail.com>
Date: Sat, 30 May 2020 21:13:44 +0800
Subject: [PATCH 34/45] move to xaml all the tickbar bindings

---
 src/Avalonia.Controls/Slider.cs        | 20 +-----------
 src/Avalonia.Controls/TickBar.cs       | 35 +++++++++++++++++++--
 src/Avalonia.Themes.Fluent/Slider.xaml | 43 +++++++-------------------
 3 files changed, 46 insertions(+), 52 deletions(-)

diff --git a/src/Avalonia.Controls/Slider.cs b/src/Avalonia.Controls/Slider.cs
index 33810cdcec..ba183904e3 100644
--- a/src/Avalonia.Controls/Slider.cs
+++ b/src/Avalonia.Controls/Slider.cs
@@ -98,13 +98,7 @@ namespace Avalonia.Controls
             _decreaseButton = e.NameScope.Find<Button>("PART_DecreaseButton");
             _track = e.NameScope.Find<Track>("PART_Track");
             _increaseButton = e.NameScope.Find<Button>("PART_IncreaseButton");
-
-            AttachTickBar(e.NameScope.Find<TickBar>("TopTickBar"));
-            AttachTickBar(e.NameScope.Find<TickBar>("BottomTickBar"));
-
-            AttachTickBar(e.NameScope.Find<TickBar>("LeftTickBar"));
-            AttachTickBar(e.NameScope.Find<TickBar>("RightTickBar"));
-
+ 
             if (_decreaseButton != null)
             {
                 _decreaseButton.Click += DecreaseClick;
@@ -116,18 +110,6 @@ namespace Avalonia.Controls
             }
         }
 
-        private void AttachTickBar(TickBar tickBar)
-        {
-            if (tickBar is null)
-                return;
-
-            tickBar[~TickBar.TickFrequencyProperty] = this[~TickFrequencyProperty];
-            tickBar[~TickBar.OrientationProperty] = this[~Slider.OrientationProperty];
-            tickBar[~TickBar.MinimumProperty] = this[~Slider.MinimumProperty];
-            tickBar[~TickBar.MaximumProperty] = this[~Slider.MaximumProperty];
-            tickBar[~TickBar.ReservedSpaceProperty] = _track.Thumb[~BoundsProperty];
-        }
-
         private void DecreaseClick(object sender, RoutedEventArgs e)
         {
             ChangeValueBy(-LargeChange);
diff --git a/src/Avalonia.Controls/TickBar.cs b/src/Avalonia.Controls/TickBar.cs
index e174ac9681..aa140a197b 100644
--- a/src/Avalonia.Controls/TickBar.cs
+++ b/src/Avalonia.Controls/TickBar.cs
@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using Avalonia.Controls.Primitives;
 using Avalonia.Data;
+using Avalonia.Data.Converters;
 using Avalonia.Layout;
 using Avalonia.Media;
 using Avalonia.Utilities;
@@ -37,6 +38,23 @@ namespace Avalonia.Controls
         // NOTE: if you add or remove any values in this enum, be sure to update TickBar.IsValidTickBarPlacement()
     };
 
+    public static class TickBarConverter
+    {
+        public static readonly IValueConverter ReservedSpaceBind =
+            new FuncValueConverter<object, Rect>(x =>
+            {
+                if (x is null)
+                {
+
+                }
+                if (x is Rect y)
+                {
+                    return y;
+                }
+                return new Rect();
+            });
+
+    }
 
     /// <summary>
     /// TickBar is an element that use for drawing Slider's Ticks.
@@ -83,7 +101,10 @@ namespace Avalonia.Controls
         public double Minimum
         {
             get { return GetValue(MinimumProperty); }
-            set { SetValue(MinimumProperty, value); }
+            set
+            {
+                SetValue(MinimumProperty, value);
+            }
         }
 
         /// <summary>
@@ -100,7 +121,7 @@ namespace Avalonia.Controls
             get { return GetValue(MaximumProperty); }
             set { SetValue(MaximumProperty, value); }
         }
- 
+
         /// <summary>
         /// Defines the <see cref="TickFrequency"/> property.
         /// </summary>
@@ -202,6 +223,16 @@ namespace Avalonia.Controls
             set { SetValue(ReservedSpaceProperty, value); }
         }
 
+        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        {
+            base.OnPropertyChanged(change);
+
+            if (change.Property == ReservedSpaceProperty)
+            {
+                // UpdatePseudoClasses(change.NewValue.GetValueOrDefault<Location>());
+            }
+        }
+
         /// <summary>
         /// Draw ticks.
         /// Ticks can be draw in 8 diffrent ways depends on Placment property and IsDirectionReversed property.
diff --git a/src/Avalonia.Themes.Fluent/Slider.xaml b/src/Avalonia.Themes.Fluent/Slider.xaml
index 77b5f9568d..648845f4b7 100644
--- a/src/Avalonia.Themes.Fluent/Slider.xaml
+++ b/src/Avalonia.Themes.Fluent/Slider.xaml
@@ -150,7 +150,7 @@
                       </RepeatButton.Template>
                     </RepeatButton>
                   </Track.IncreaseButton>
-                  <Thumb Classes="SliderThumbStyle" Name="thumb" Margin="0" Padding="0" DataContext="{TemplateBinding Value}" Height="{DynamicResource SliderVerticalThumbHeight}" Width="{DynamicResource SliderVerticalThumbWidth}" />
+                  <Thumb Classes="SliderThumbStyle" Name="SliderThumb" Margin="0" Padding="0" DataContext="{TemplateBinding Value}" Height="{DynamicResource SliderVerticalThumbHeight}" Width="{DynamicResource SliderVerticalThumbWidth}" />
                 </Track>
               </Grid>
             </Grid>
@@ -166,6 +166,15 @@
     <Setter Property="Value" Value="{TemplateBinding Value, Mode=TwoWay}"/>
   </Style>
 
+  <Style Selector="Slider /template/ TickBar">
+    <Setter Property="Fill" Value="{DynamicResource SliderTickBarFill}" />
+    <Setter Property="TickFrequency" Value="{TemplateBinding Slider.TickFrequency}" />
+    <Setter Property="Orientation" Value="{TemplateBinding Slider.Orientation}" />
+    <Setter Property="Minimum" Value="{TemplateBinding Slider.Minimum}" />
+    <Setter Property="Maximum" Value="{TemplateBinding Slider.Maximum}" />
+    <Setter Property="ReservedSpace" Value="{Binding #SliderThumb.Bound, Converter={x:Static TickBarConverter.ReservedSpaceBind}}" />
+  </Style>
+
   <!-- Normal State -->
   <Style Selector="Slider /template/ Thumb.SliderThumbStyle">
     <Setter Property="Background" Value="{DynamicResource SliderThumbBackground}" />
@@ -175,22 +184,6 @@
     <Setter Property="Background" Value="{DynamicResource SliderContainerBackground}" />
   </Style>
 
-  <Style Selector="Slider /template/ TickBar#TopTickBar">
-    <Setter Property="Fill" Value="{DynamicResource SliderTickBarFill}" />
-  </Style>
-
-  <Style Selector="Slider /template/ TickBar#BottomTickBar">
-    <Setter Property="Fill" Value="{DynamicResource SliderTickBarFill}" />
-  </Style>
-
-  <Style Selector="Slider /template/ TickBar#LeftTickBar">
-    <Setter Property="Fill" Value="{DynamicResource SliderTickBarFill}" />
-  </Style>
-
-  <Style Selector="Slider /template/ TickBar#RightTickBar">
-    <Setter Property="Fill" Value="{DynamicResource SliderTickBarFill}" />
-  </Style>
-
   <!-- Disabled State -->
   <Style Selector="Slider:disabled /template/ ContentPresenter#HeaderContentPresenter">
     <Setter Property="TextBlock.Foreground" Value="{DynamicResource SliderHeaderForegroundDisabled}" />
@@ -208,22 +201,10 @@
     <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundDisabled}" />
   </Style>
 
-  <Style Selector="Slider:disabled /template/ TickBar#TopTickBar">
+  <Style Selector="Slider:disabled /template/ TickBar">
     <Setter Property="Fill" Value="{DynamicResource SliderTickBarFillDisabled}" />
   </Style>
-
-  <Style Selector="Slider:disabled /template/ TickBar#BottomTickBar">
-    <Setter Property="Fill" Value="{DynamicResource SliderTickBarFillDisabled}" />
-  </Style>
-
-  <Style Selector="Slider:disabled /template/ TickBar#LeftTickBar">
-    <Setter Property="Fill" Value="{DynamicResource SliderTickBarFillDisabled}" />
-  </Style>
-
-  <Style Selector="Slider:disabled /template/ TickBar#RightTickBar">
-    <Setter Property="Fill" Value="{DynamicResource SliderTickBarFillDisabled}" />
-  </Style>
-
+ 
   <Style Selector="Slider:pointerover /template/ Grid#SliderContainer">
     <Setter Property="Background" Value="{DynamicResource SliderContainerBackgroundDisabled}" />
   </Style>

From 5f421f33788a8d5343b4064b459986fea720444f Mon Sep 17 00:00:00 2001
From: Jumar Macato <hikari.netto23@gmail.com>
Date: Sat, 30 May 2020 21:23:15 +0800
Subject: [PATCH 35/45] fix reservedspace

---
 src/Avalonia.Controls/TickBar.cs       | 18 ------------------
 src/Avalonia.Themes.Fluent/Slider.xaml | 13 ++++++++++---
 2 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/src/Avalonia.Controls/TickBar.cs b/src/Avalonia.Controls/TickBar.cs
index aa140a197b..b6637643e8 100644
--- a/src/Avalonia.Controls/TickBar.cs
+++ b/src/Avalonia.Controls/TickBar.cs
@@ -36,24 +36,6 @@ namespace Avalonia.Controls
         Bottom,
 
         // NOTE: if you add or remove any values in this enum, be sure to update TickBar.IsValidTickBarPlacement()
-    };
-
-    public static class TickBarConverter
-    {
-        public static readonly IValueConverter ReservedSpaceBind =
-            new FuncValueConverter<object, Rect>(x =>
-            {
-                if (x is null)
-                {
-
-                }
-                if (x is Rect y)
-                {
-                    return y;
-                }
-                return new Rect();
-            });
-
     }
 
     /// <summary>
diff --git a/src/Avalonia.Themes.Fluent/Slider.xaml b/src/Avalonia.Themes.Fluent/Slider.xaml
index 648845f4b7..7afbac5f63 100644
--- a/src/Avalonia.Themes.Fluent/Slider.xaml
+++ b/src/Avalonia.Themes.Fluent/Slider.xaml
@@ -50,8 +50,12 @@
           <Grid Name="grid" Margin="{TemplateBinding Padding}" RowDefinitions="Auto, *">
             <ContentPresenter x:Name="HeaderContentPresenter" Grid.Row="0" TextBlock.FontWeight="{DynamicResource SliderHeaderThemeFontWeight}" TextBlock.Foreground="{DynamicResource SliderHeaderForeground}" Margin="{DynamicResource SliderTopHeaderMargin}" />
             <Grid x:Name="SliderContainer" Grid.Row="1">
+              <Grid.Styles>
+                <Style Selector="TickBar"> 
+                  <Setter Property="ReservedSpace" Value="{Binding #PART_Track.Thumb.Bounds}" />
+                </Style>
+              </Grid.Styles>
               <Grid x:Name="HorizontalTemplate" ColumnDefinitions="Auto,Auto,*" MinHeight="{DynamicResource SliderHorizontalHeight}">
-
                 <Grid.RowDefinitions>
                   <RowDefinition Height="{DynamicResource SliderPreContentMargin}" />
                   <RowDefinition Height="Auto" />
@@ -111,8 +115,12 @@
           <Grid Name="grid" Margin="{TemplateBinding Padding}" RowDefinitions="Auto, *">
             <ContentPresenter x:Name="HeaderContentPresenter" Grid.Row="0" TextBlock.FontWeight="{DynamicResource SliderHeaderThemeFontWeight}" TextBlock.Foreground="{DynamicResource SliderHeaderForeground}" Margin="{DynamicResource SliderTopHeaderMargin}" />
             <Grid x:Name="SliderContainer" Grid.Row="1">
+              <Grid.Styles>
+                <Style Selector="TickBar"> 
+                  <Setter Property="ReservedSpace" Value="{Binding #PART_Track.Thumb.Bounds}" />
+                </Style>
+              </Grid.Styles>
               <Grid x:Name="VerticalTemplate" RowDefinitions="*,Auto,Auto" MinWidth="{DynamicResource SliderVerticalWidth}">
-
                 <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="{DynamicResource SliderPreContentMargin}" />
                   <ColumnDefinition Width="Auto" />
@@ -172,7 +180,6 @@
     <Setter Property="Orientation" Value="{TemplateBinding Slider.Orientation}" />
     <Setter Property="Minimum" Value="{TemplateBinding Slider.Minimum}" />
     <Setter Property="Maximum" Value="{TemplateBinding Slider.Maximum}" />
-    <Setter Property="ReservedSpace" Value="{Binding #SliderThumb.Bound, Converter={x:Static TickBarConverter.ReservedSpaceBind}}" />
   </Style>
 
   <!-- Normal State -->

From 546e52be154485d580b4c4f17f382cc92f7ae5de Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Sat, 30 May 2020 13:31:04 -0300
Subject: [PATCH 36/45] remove unused code.

---
 src/Avalonia.Controls/Slider.cs | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/src/Avalonia.Controls/Slider.cs b/src/Avalonia.Controls/Slider.cs
index ba183904e3..01a23c2582 100644
--- a/src/Avalonia.Controls/Slider.cs
+++ b/src/Avalonia.Controls/Slider.cs
@@ -98,7 +98,7 @@ namespace Avalonia.Controls
             _decreaseButton = e.NameScope.Find<Button>("PART_DecreaseButton");
             _track = e.NameScope.Find<Track>("PART_Track");
             _increaseButton = e.NameScope.Find<Button>("PART_IncreaseButton");
- 
+
             if (_decreaseButton != null)
             {
                 _decreaseButton.Click += DecreaseClick;
@@ -199,24 +199,6 @@ namespace Avalonia.Controls
             return value;
         }
 
-        private void HandlePointerPressed(PointerPressedEventArgs e)
-        {
-            if (e.GetCurrentPoint(this).Properties.IsLeftButtonPressed)
-            {
-                UpdatePseudoClasses(true);
-            }
-        }
-
-        private void HandlePointerReleased()
-        {
-            UpdatePseudoClasses(false);
-        }
-
-        private void UpdatePseudoClasses(bool isPressed)
-        {
-            PseudoClasses.Set(":pressed", isPressed);
-        }
-
         private void UpdatePseudoClasses(Orientation o)
         {
             PseudoClasses.Set(":vertical", o == Orientation.Vertical);

From 136a07497a87681b2343a111e095f64d44b835a2 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Sat, 30 May 2020 13:31:20 -0300
Subject: [PATCH 37/45] show horizontal ticks.

---
 samples/ControlCatalog/Pages/SliderPage.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/ControlCatalog/Pages/SliderPage.xaml b/samples/ControlCatalog/Pages/SliderPage.xaml
index 58f7b881fe..9cdefa812f 100644
--- a/samples/ControlCatalog/Pages/SliderPage.xaml
+++ b/samples/ControlCatalog/Pages/SliderPage.xaml
@@ -9,7 +9,7 @@
       <Slider Value="0"
               Minimum="0"
               Maximum="100"
-              Width="300"/>
+              Width="300" TickFrequency="10" />
       <Slider Value="0"
               Minimum="0"
               Maximum="100"

From 41c96e905bb72548628fcf9188376537abf65aef Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Sat, 30 May 2020 13:33:09 -0300
Subject: [PATCH 38/45] revert unrelated change.

---
 src/Avalonia.Visuals/Media/Color.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Avalonia.Visuals/Media/Color.cs b/src/Avalonia.Visuals/Media/Color.cs
index 85808698f9..2e06d2578f 100644
--- a/src/Avalonia.Visuals/Media/Color.cs
+++ b/src/Avalonia.Visuals/Media/Color.cs
@@ -1,5 +1,4 @@
 using System;
-using System.ComponentModel;
 using System.Globalization;
 using Avalonia.Animation.Animators;
 

From 90484787f3988253e060a7880acddad6a62ec42f Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Sat, 30 May 2020 13:35:14 -0300
Subject: [PATCH 39/45] revert file.

---
 src/Avalonia.Themes.Default/Slider.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Themes.Default/Slider.xaml b/src/Avalonia.Themes.Default/Slider.xaml
index 9196663dd0..b21cbf3650 100644
--- a/src/Avalonia.Themes.Default/Slider.xaml
+++ b/src/Avalonia.Themes.Default/Slider.xaml
@@ -90,4 +90,4 @@
     <Style Selector="Slider:disabled /template/ Grid#grid">
         <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}" />
     </Style>
-</Styles>
\ No newline at end of file
+</Styles>

From 6d5fdce4db08db9b7b4df577fdb638ea06569b2e Mon Sep 17 00:00:00 2001
From: Jumar Macato <hikari.netto23@gmail.com>
Date: Sun, 31 May 2020 01:21:23 +0800
Subject: [PATCH 40/45] Jump to value on press

---
 src/Avalonia.Controls/Slider.cs | 67 +++++++++++++++++----------------
 1 file changed, 35 insertions(+), 32 deletions(-)

diff --git a/src/Avalonia.Controls/Slider.cs b/src/Avalonia.Controls/Slider.cs
index 01a23c2582..0b5536c530 100644
--- a/src/Avalonia.Controls/Slider.cs
+++ b/src/Avalonia.Controls/Slider.cs
@@ -34,6 +34,8 @@ namespace Avalonia.Controls
         private Track _track;
         private Button _decreaseButton;
         private Button _increaseButton;
+        private IDisposable _decreaseButtonSubscription;
+        private IDisposable _increaseButtonSubscription;
 
         /// <summary>
         /// Initializes static members of the <see cref="Slider"/> class. 
@@ -85,15 +87,8 @@ namespace Avalonia.Controls
         /// <inheritdoc/>
         protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
         {
-            if (_decreaseButton != null)
-            {
-                _decreaseButton.Click -= DecreaseClick;
-            }
-
-            if (_increaseButton != null)
-            {
-                _increaseButton.Click -= IncreaseClick;
-            }
+            _decreaseButtonSubscription?.Dispose();
+            _increaseButtonSubscription?.Dispose();
 
             _decreaseButton = e.NameScope.Find<Button>("PART_DecreaseButton");
             _track = e.NameScope.Find<Track>("PART_Track");
@@ -101,40 +96,49 @@ namespace Avalonia.Controls
 
             if (_decreaseButton != null)
             {
-                _decreaseButton.Click += DecreaseClick;
+                _decreaseButtonSubscription = _decreaseButton.AddDisposableHandler(PointerPressedEvent, TrackPressed, RoutingStrategies.Tunnel);
             }
 
             if (_increaseButton != null)
             {
-                _increaseButton.Click += IncreaseClick;
+                _increaseButtonSubscription = _increaseButton.AddDisposableHandler(PointerPressedEvent, TrackPressed, RoutingStrategies.Tunnel);
             }
         }
 
-        private void DecreaseClick(object sender, RoutedEventArgs e)
+        private void TrackPressed(object sender, PointerPressedEventArgs e)
         {
-            ChangeValueBy(-LargeChange);
-        }
+            if (!e.GetCurrentPoint(this).Properties.IsLeftButtonPressed)
+                return;
 
-        private void IncreaseClick(object sender, RoutedEventArgs e)
-        {
-            ChangeValueBy(LargeChange);
-        }
+            var x = e.GetCurrentPoint(_track);
 
-        private void ChangeValueBy(double by)
-        {
-            if (IsSnapToTickEnabled)
-            {
-                by = by < 0 ? Math.Min(-TickFrequency, by) : Math.Max(TickFrequency, by);
-            }
+            var orient = Orientation == Orientation.Horizontal;
+            var pointDen = orient ? _track.Bounds.Width : _track.Bounds.Height;
+            var pointNum = orient ? x.Position.X : x.Position.Y;
+            var invert = orient ? 0 : 1;
+            var calcVal = Math.Abs(invert - (pointNum / pointDen));
+            var range = Maximum - Minimum;
+            
+            Value = calcVal * range;
 
-            var value = Value;
-            var next = SnapToTick(Math.Max(Math.Min(value + by, Maximum), Minimum));
-            if (next != value)
-            {
-                Value = next;
-            }
+            e.Handled = true;
         }
 
+        // private void ChangeValueBy(double by)
+        // {
+        //     if (IsSnapToTickEnabled)
+        //     {
+        //         by = by < 0 ? Math.Min(-TickFrequency, by) : Math.Max(TickFrequency, by);
+        //     }
+
+        //     var value = Value;
+        //     var next = SnapToTick(Math.Max(Math.Min(value + by, Maximum), Minimum));
+        //     if (next != value)
+        //     {
+        //         Value = next;
+        //     }
+        // }
+        
         protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
         {
             base.OnPropertyChanged(change);
@@ -159,8 +163,7 @@ namespace Avalonia.Controls
         /// <param name="e"></param>
         protected virtual void OnThumbDragDelta(VectorEventArgs e)
         {
-            Thumb thumb = e.Source as Thumb;
-            if (thumb != null && _track?.Thumb == thumb)
+            if (e.Source is Thumb thumb && _track?.Thumb == thumb)
             {
                 MoveToNextTick(_track.Value);
             }

From 7412e3c47c17526ab78c0410281f59e3fb4bc214 Mon Sep 17 00:00:00 2001
From: Jumar Macato <16554748+jmacato@users.noreply.github.com>
Date: Sun, 31 May 2020 01:30:42 +0800
Subject: [PATCH 41/45] Update src/Avalonia.Controls/TickBar.cs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Dariusz Komosiński <darek.komosinski@gmail.com>
---
 src/Avalonia.Controls/TickBar.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/TickBar.cs b/src/Avalonia.Controls/TickBar.cs
index b6637643e8..4b8f7950c0 100644
--- a/src/Avalonia.Controls/TickBar.cs
+++ b/src/Avalonia.Controls/TickBar.cs
@@ -41,7 +41,7 @@ namespace Avalonia.Controls
     /// <summary>
     /// TickBar is an element that use for drawing Slider's Ticks.
     /// </summary>
-    public class TickBar : TemplatedControl
+    public class TickBar : Control
     {
         static TickBar()
         {

From fb4cb4e1e19d9f517781f6b0f1c02b9c289e6d3d Mon Sep 17 00:00:00 2001
From: Jumar Macato <hikari.netto23@gmail.com>
Date: Sun, 31 May 2020 10:12:39 +0800
Subject: [PATCH 42/45] add snapping action

---
 src/Avalonia.Controls/Slider.cs | 108 ++++++++++++++++----------------
 1 file changed, 55 insertions(+), 53 deletions(-)

diff --git a/src/Avalonia.Controls/Slider.cs b/src/Avalonia.Controls/Slider.cs
index 0b5536c530..17e8f51838 100644
--- a/src/Avalonia.Controls/Slider.cs
+++ b/src/Avalonia.Controls/Slider.cs
@@ -4,6 +4,7 @@ using Avalonia.Controls.Primitives;
 using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.Layout;
+using Avalonia.Utilities;
 
 namespace Avalonia.Controls
 {
@@ -31,11 +32,15 @@ namespace Avalonia.Controls
             AvaloniaProperty.Register<Slider, double>(nameof(TickFrequency), 0.0);
 
         // Slider required parts
+        private bool _isDragging = false;
         private Track _track;
         private Button _decreaseButton;
         private Button _increaseButton;
-        private IDisposable _decreaseButtonSubscription;
+        private IDisposable _decreaseButtonPressDispose;
+        private IDisposable _decreaseButtonReleaseDispose;
         private IDisposable _increaseButtonSubscription;
+        private IDisposable _increaseButtonReleaseDispose;
+        private IDisposable _pointerMovedDispose;
 
         /// <summary>
         /// Initializes static members of the <see cref="Slider"/> class. 
@@ -45,7 +50,6 @@ namespace Avalonia.Controls
             PressedMixin.Attach<Slider>();
             OrientationProperty.OverrideDefaultValue(typeof(Slider), Orientation.Horizontal);
             Thumb.DragStartedEvent.AddClassHandler<Slider>((x, e) => x.OnThumbDragStarted(e), RoutingStrategies.Bubble);
-            Thumb.DragDeltaEvent.AddClassHandler<Slider>((x, e) => x.OnThumbDragDelta(e), RoutingStrategies.Bubble);
             Thumb.DragCompletedEvent.AddClassHandler<Slider>((x, e) => x.OnThumbDragCompleted(e), RoutingStrategies.Bubble);
         }
 
@@ -87,58 +91,72 @@ namespace Avalonia.Controls
         /// <inheritdoc/>
         protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
         {
-            _decreaseButtonSubscription?.Dispose();
+            _decreaseButtonPressDispose?.Dispose();
+            _decreaseButtonReleaseDispose?.Dispose();
             _increaseButtonSubscription?.Dispose();
+            _increaseButtonReleaseDispose?.Dispose();
+            _pointerMovedDispose?.Dispose();
 
             _decreaseButton = e.NameScope.Find<Button>("PART_DecreaseButton");
             _track = e.NameScope.Find<Track>("PART_Track");
             _increaseButton = e.NameScope.Find<Button>("PART_IncreaseButton");
 
+            if (_track != null)
+            {
+                _track.Thumb.IsHitTestVisible = true;
+            }
+
             if (_decreaseButton != null)
             {
-                _decreaseButtonSubscription = _decreaseButton.AddDisposableHandler(PointerPressedEvent, TrackPressed, RoutingStrategies.Tunnel);
+                _decreaseButtonPressDispose = _decreaseButton.AddDisposableHandler(PointerPressedEvent, TrackPressed, RoutingStrategies.Tunnel);
+                _decreaseButtonReleaseDispose = _decreaseButton.AddDisposableHandler(PointerReleasedEvent, TrackReleased, RoutingStrategies.Tunnel);
             }
 
             if (_increaseButton != null)
             {
                 _increaseButtonSubscription = _increaseButton.AddDisposableHandler(PointerPressedEvent, TrackPressed, RoutingStrategies.Tunnel);
+                _increaseButtonReleaseDispose = _increaseButton.AddDisposableHandler(PointerReleasedEvent, TrackReleased, RoutingStrategies.Tunnel);
             }
+
+            _pointerMovedDispose = this.AddDisposableHandler(PointerMovedEvent, TrackMoved, RoutingStrategies.Tunnel);
         }
 
-        private void TrackPressed(object sender, PointerPressedEventArgs e)
+        private void TrackMoved(object sender, PointerEventArgs e)
+        {
+            if (_isDragging)
+            {
+                MoveToPoint(e.GetCurrentPoint(_track));
+            }
+        }
+
+        private void TrackReleased(object sender, PointerReleasedEventArgs e)
         {
-            if (!e.GetCurrentPoint(this).Properties.IsLeftButtonPressed)
-                return;
+            _isDragging = false;
+        }
 
-            var x = e.GetCurrentPoint(_track);
+        private void TrackPressed(object sender, PointerPressedEventArgs e)
+        {
+            if (e.GetCurrentPoint(this).Properties.IsLeftButtonPressed)
+            {
+                MoveToPoint(e.GetCurrentPoint(_track));
+                _isDragging = true;
+            }
+        }
 
+        private void MoveToPoint(PointerPoint x)
+        {
             var orient = Orientation == Orientation.Horizontal;
             var pointDen = orient ? _track.Bounds.Width : _track.Bounds.Height;
             var pointNum = orient ? x.Position.X : x.Position.Y;
+            var logicalPos = MathUtilities.Clamp(pointNum / pointDen, 0.0d, 1.0d);
             var invert = orient ? 0 : 1;
-            var calcVal = Math.Abs(invert - (pointNum / pointDen));
+            var calcVal = Math.Abs(invert - logicalPos);
             var range = Maximum - Minimum;
-            
-            Value = calcVal * range;
+            var finalValue = calcVal * range;
 
-            e.Handled = true;
+            Value = IsSnapToTickEnabled ? SnapToTick(finalValue) : finalValue;
         }
 
-        // private void ChangeValueBy(double by)
-        // {
-        //     if (IsSnapToTickEnabled)
-        //     {
-        //         by = by < 0 ? Math.Min(-TickFrequency, by) : Math.Max(TickFrequency, by);
-        //     }
-
-        //     var value = Value;
-        //     var next = SnapToTick(Math.Max(Math.Min(value + by, Maximum), Minimum));
-        //     if (next != value)
-        //     {
-        //         Value = next;
-        //     }
-        // }
-        
         protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
         {
             base.OnPropertyChanged(change);
@@ -155,18 +173,7 @@ namespace Avalonia.Controls
         /// <param name="e"></param>
         protected virtual void OnThumbDragStarted(VectorEventArgs e)
         {
-        }
-
-        /// <summary>
-        /// Called when user dragging the <see cref="Thumb"/>.
-        /// </summary>
-        /// <param name="e"></param>
-        protected virtual void OnThumbDragDelta(VectorEventArgs e)
-        {
-            if (e.Source is Thumb thumb && _track?.Thumb == thumb)
-            {
-                MoveToNextTick(_track.Value);
-            }
+            _isDragging = true;
         }
 
         /// <summary>
@@ -175,15 +182,7 @@ namespace Avalonia.Controls
         /// <param name="e"></param>
         protected virtual void OnThumbDragCompleted(VectorEventArgs e)
         {
-        }
-
-        /// <summary>
-        /// Searches for the closest tick and sets Value to that tick.
-        /// </summary>
-        /// <param name="value">Value that want to snap to closest Tick.</param>
-        private void MoveToNextTick(double value)
-        {
-            Value = SnapToTick(Math.Max(Minimum, Math.Min(Maximum, value)));
+            _isDragging = false;
         }
 
         /// <summary>
@@ -192,14 +191,17 @@ namespace Avalonia.Controls
         /// <param name="value">Value that want to snap to closest Tick.</param>
         private double SnapToTick(double value)
         {
-            if (IsSnapToTickEnabled && TickFrequency > 0.0)
+            var previous = Minimum;
+            var next = Maximum;
+
+            if (MathUtilities.GreaterThan(TickFrequency, 0.0))
             {
-                double previous = Minimum + (Math.Round(((value - Minimum) / TickFrequency)) * TickFrequency);
-                double next = Math.Min(Maximum, previous + TickFrequency);
-                value = value > (previous + next) * 0.5 ? next : previous;
+                previous = Minimum + (Math.Round((value - Minimum) / TickFrequency) * TickFrequency);
+                next = Math.Min(Maximum, previous + TickFrequency);
             }
 
-            return value;
+            // Choose the closest value between previous and next. If tie, snap to 'next'.
+            return MathUtilities.GreaterThanOrClose(value, (previous + next) * 0.5) ? next : previous;
         }
 
         private void UpdatePseudoClasses(Orientation o)

From 450aea3d5b2d375b9bd2c9412b1d13aa35f7e01b Mon Sep 17 00:00:00 2001
From: Jumar Macato <hikari.netto23@gmail.com>
Date: Sun, 31 May 2020 10:15:50 +0800
Subject: [PATCH 43/45] set hit test correctly

---
 src/Avalonia.Controls/Slider.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/Slider.cs b/src/Avalonia.Controls/Slider.cs
index 17e8f51838..1c7d00628e 100644
--- a/src/Avalonia.Controls/Slider.cs
+++ b/src/Avalonia.Controls/Slider.cs
@@ -103,7 +103,7 @@ namespace Avalonia.Controls
 
             if (_track != null)
             {
-                _track.Thumb.IsHitTestVisible = true;
+                _track.Thumb.IsHitTestVisible = false;
             }
 
             if (_decreaseButton != null)

From b035015302bc1344c4b78fe85619bed1757b0567 Mon Sep 17 00:00:00 2001
From: Jumar Macato <hikari.netto23@gmail.com>
Date: Sun, 31 May 2020 10:23:17 +0800
Subject: [PATCH 44/45] add new API for Track for controls that handles their
 own dragging logic.

---
 src/Avalonia.Controls/Primitives/Track.cs | 14 +++++++++++++-
 src/Avalonia.Controls/Slider.cs           |  2 +-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Controls/Primitives/Track.cs b/src/Avalonia.Controls/Primitives/Track.cs
index e104a8a664..1db47a13e7 100644
--- a/src/Avalonia.Controls/Primitives/Track.cs
+++ b/src/Avalonia.Controls/Primitives/Track.cs
@@ -41,13 +41,16 @@ namespace Avalonia.Controls.Primitives
         public static readonly StyledProperty<bool> IsDirectionReversedProperty =
             AvaloniaProperty.Register<Track, bool>(nameof(IsDirectionReversed));
 
+        public static readonly StyledProperty<bool> IgnoreThumbDragProperty =
+            AvaloniaProperty.Register<Track, bool>(nameof(IsThumbDragHandled));
+
         private double _minimum;
         private double _maximum = 100.0;
         private double _value;
 
         static Track()
         {
-            ThumbProperty.Changed.AddClassHandler<Track>((x,e) => x.ThumbChanged(e));
+            ThumbProperty.Changed.AddClassHandler<Track>((x, e) => x.ThumbChanged(e));
             IncreaseButtonProperty.Changed.AddClassHandler<Track>((x, e) => x.ButtonChanged(e));
             DecreaseButtonProperty.Changed.AddClassHandler<Track>((x, e) => x.ButtonChanged(e));
             AffectsArrange<Track>(MinimumProperty, MaximumProperty, ValueProperty, OrientationProperty);
@@ -113,6 +116,12 @@ namespace Avalonia.Controls.Primitives
             set { SetValue(IsDirectionReversedProperty, value); }
         }
 
+        public bool IsThumbDragHandled
+        {
+            get { return GetValue(IgnoreThumbDragProperty); }
+            set { SetValue(IgnoreThumbDragProperty, value); }
+        }
+
         private double ThumbCenterOffset { get; set; }
         private double Density { get; set; }
 
@@ -422,6 +431,9 @@ namespace Avalonia.Controls.Primitives
 
         private void ThumbDragged(object sender, VectorEventArgs e)
         {
+            if (IsThumbDragHandled)
+                return;
+                
             Value = MathUtilities.Clamp(
                 Value + ValueFromDistance(e.Vector.X, e.Vector.Y),
                 Minimum,
diff --git a/src/Avalonia.Controls/Slider.cs b/src/Avalonia.Controls/Slider.cs
index 1c7d00628e..b930fd1f3e 100644
--- a/src/Avalonia.Controls/Slider.cs
+++ b/src/Avalonia.Controls/Slider.cs
@@ -103,7 +103,7 @@ namespace Avalonia.Controls
 
             if (_track != null)
             {
-                _track.Thumb.IsHitTestVisible = false;
+                _track.IsThumbDragHandled = true;
             }
 
             if (_decreaseButton != null)

From 39c14454ee7f561db85fc65c5ce7d9319574c337 Mon Sep 17 00:00:00 2001
From: Jumar Macato <hikari.netto23@gmail.com>
Date: Sun, 31 May 2020 10:24:41 +0800
Subject: [PATCH 45/45] simplify cmp

---
 src/Avalonia.Controls/Slider.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/Slider.cs b/src/Avalonia.Controls/Slider.cs
index b930fd1f3e..4efcbd6a2d 100644
--- a/src/Avalonia.Controls/Slider.cs
+++ b/src/Avalonia.Controls/Slider.cs
@@ -194,7 +194,7 @@ namespace Avalonia.Controls
             var previous = Minimum;
             var next = Maximum;
 
-            if (MathUtilities.GreaterThan(TickFrequency, 0.0))
+            if (TickFrequency > 0.0)
             {
                 previous = Minimum + (Math.Round((value - Minimum) / TickFrequency) * TickFrequency);
                 next = Math.Min(Maximum, previous + TickFrequency);