From 338fe1d5eb18c6820a1b1196e2e190c3ce57ebef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?= <wieslaw.soltes@gmail.com>
Date: Sun, 18 Nov 2018 14:11:55 +0100
Subject: [PATCH] Use thickness instead of width and height

---
 src/Avalonia.Themes.Default/Accents/BaseDark.xaml  | 3 +--
 src/Avalonia.Themes.Default/Accents/BaseLight.xaml | 3 +--
 src/Avalonia.Themes.Default/ScrollBar.xaml         | 8 ++++----
 tests/Avalonia.Layout.UnitTests/FullLayoutTests.cs | 3 +--
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/Avalonia.Themes.Default/Accents/BaseDark.xaml b/src/Avalonia.Themes.Default/Accents/BaseDark.xaml
index 2a20892869..e9d710b3f0 100644
--- a/src/Avalonia.Themes.Default/Accents/BaseDark.xaml
+++ b/src/Avalonia.Themes.Default/Accents/BaseDark.xaml
@@ -53,7 +53,6 @@
         <sys:Double x:Key="FontSizeNormal">12</sys:Double>
         <sys:Double x:Key="FontSizeLarge">16</sys:Double>
 
-        <sys:Double x:Key="ScrollBarWidth">10</sys:Double>
-        <sys:Double x:Key="ScrollBarHeight">10</sys:Double>
+        <sys:Double x:Key="ScrollBarThickness">10</sys:Double>
     </Style.Resources>
 </Style>
diff --git a/src/Avalonia.Themes.Default/Accents/BaseLight.xaml b/src/Avalonia.Themes.Default/Accents/BaseLight.xaml
index e94653a3d6..c40305151e 100644
--- a/src/Avalonia.Themes.Default/Accents/BaseLight.xaml
+++ b/src/Avalonia.Themes.Default/Accents/BaseLight.xaml
@@ -53,7 +53,6 @@
         <sys:Double x:Key="FontSizeNormal">12</sys:Double>
         <sys:Double x:Key="FontSizeLarge">16</sys:Double>
 
-        <sys:Double x:Key="ScrollBarWidth">10</sys:Double>
-        <sys:Double x:Key="ScrollBarHeight">10</sys:Double>
+        <sys:Double x:Key="ScrollBarThickness">10</sys:Double>
     </Style.Resources>
 </Style>
diff --git a/src/Avalonia.Themes.Default/ScrollBar.xaml b/src/Avalonia.Themes.Default/ScrollBar.xaml
index 982af43587..2cb8ce2d24 100644
--- a/src/Avalonia.Themes.Default/ScrollBar.xaml
+++ b/src/Avalonia.Themes.Default/ScrollBar.xaml
@@ -53,7 +53,7 @@
         </Setter>
     </Style>
     <Style Selector="ScrollBar:horizontal">
-        <Setter Property="Height" Value="{DynamicResource ScrollBarHeight}" />
+        <Setter Property="Height" Value="{DynamicResource ScrollBarThickness}" />
         <Setter Property="Template">
             <ControlTemplate>
                 <Border Background="{DynamicResource ThemeControlMidBrush}">
@@ -107,13 +107,13 @@
         </Setter>
     </Style>
     <Style Selector="ScrollBar:horizontal /template/ Thumb#thumb">
-        <Setter Property="MinWidth" Value="{DynamicResource ScrollBarWidth}" />
+        <Setter Property="MinWidth" Value="{DynamicResource ScrollBarThickness}" />
     </Style>
     <Style Selector="ScrollBar:vertical">
-        <Setter Property="Width" Value="{DynamicResource ScrollBarWidth}" />
+        <Setter Property="Width" Value="{DynamicResource ScrollBarThickness}" />
     </Style>
     <Style Selector="ScrollBar:vertical /template/ Thumb#thumb">
-        <Setter Property="MinHeight" Value="{DynamicResource ScrollBarHeight}" />
+        <Setter Property="MinHeight" Value="{DynamicResource ScrollBarThickness}" />
     </Style>
     <Style Selector="ScrollBar /template/ RepeatButton.repeat">
         <Setter Property="Padding" Value="2" />
diff --git a/tests/Avalonia.Layout.UnitTests/FullLayoutTests.cs b/tests/Avalonia.Layout.UnitTests/FullLayoutTests.cs
index 92fc08b335..ffdb146eec 100644
--- a/tests/Avalonia.Layout.UnitTests/FullLayoutTests.cs
+++ b/tests/Avalonia.Layout.UnitTests/FullLayoutTests.cs
@@ -99,8 +99,7 @@ namespace Avalonia.Layout.UnitTests
                     }
                 };
 
-                window.Resources["ScrollBarWidth"] = 10.0;
-                window.Resources["ScrollBarHeight"] = 10.0;
+                window.Resources["ScrollBarThickness"] = 10.0;
 
                 window.Show();
                 window.LayoutManager.ExecuteInitialLayoutPass(window);