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] 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 -->