From b7e509f04637c9fccec17f38caadd5e68196c055 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Fri, 18 Oct 2019 15:35:08 +0100
Subject: [PATCH 1/7] thumb adds :pressed pseudo class.

---
 src/Avalonia.Controls/Primitives/Thumb.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Avalonia.Controls/Primitives/Thumb.cs b/src/Avalonia.Controls/Primitives/Thumb.cs
index 7e9680dc9f..9f5ddb666c 100644
--- a/src/Avalonia.Controls/Primitives/Thumb.cs
+++ b/src/Avalonia.Controls/Primitives/Thumb.cs
@@ -83,6 +83,8 @@ namespace Avalonia.Controls.Primitives
                 Vector = (Vector)_lastPoint,
             };
 
+            PseudoClasses.Add(":pressed");
+
             RaiseEvent(ev);
         }
 
@@ -102,6 +104,8 @@ namespace Avalonia.Controls.Primitives
 
                 RaiseEvent(ev);
             }
+
+            PseudoClasses.Remove(":pressed");
         }
     }
 }

From 5b1a552127e240b16fb8d34fe9dc0698c79f35ab Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Fri, 18 Oct 2019 15:35:51 +0100
Subject: [PATCH 2/7] fill in the bottom right corner of scrollviewer area
 where the horizontal and vertical scrollbars meet.

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

diff --git a/src/Avalonia.Themes.Default/ScrollViewer.xaml b/src/Avalonia.Themes.Default/ScrollViewer.xaml
index 3e130cad67..38f4eef964 100644
--- a/src/Avalonia.Themes.Default/ScrollViewer.xaml
+++ b/src/Avalonia.Themes.Default/ScrollViewer.xaml
@@ -36,6 +36,7 @@
                    Visibility="{TemplateBinding VerticalScrollBarVisibility}"
                    Grid.Column="1"
                    Focusable="False"/>
+        <Panel Grid.Row="1" Grid.Column="1" Background="{DynamicResource ThemeControlMidBrush}"/>
       </Grid>
     </ControlTemplate>
   </Setter>

From 1bc56dc777cd1e41eaa72306877add569dd88023 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Fri, 18 Oct 2019 15:36:29 +0100
Subject: [PATCH 3/7] overhaul scrollbar templates, to support pointer over,
 pointer pressed, and nice arrows. basically matches visual studio now.

---
 src/Avalonia.Themes.Default/RepeatButton.xaml |   6 +-
 src/Avalonia.Themes.Default/ScrollBar.xaml    | 264 +++++++++---------
 2 files changed, 139 insertions(+), 131 deletions(-)

diff --git a/src/Avalonia.Themes.Default/RepeatButton.xaml b/src/Avalonia.Themes.Default/RepeatButton.xaml
index f555209471..702e4e6ebd 100644
--- a/src/Avalonia.Themes.Default/RepeatButton.xaml
+++ b/src/Avalonia.Themes.Default/RepeatButton.xaml
@@ -33,12 +33,8 @@
         <Setter Property="BorderBrush"
                 Value="{DynamicResource ThemeBorderMidBrush}" />
     </Style>
-    <Style Selector="RepeatButton:pressed  /template/ ContentPresenter">
-        <Setter Property="Background"
-                Value="{DynamicResource ThemeControlHighBrush}" />
-    </Style>
     <Style Selector="RepeatButton:disabled">
         <Setter Property="Opacity"
                 Value="{DynamicResource ThemeDisabledOpacity}" />
     </Style>
-</Styles>
\ No newline at end of file
+</Styles>
diff --git a/src/Avalonia.Themes.Default/ScrollBar.xaml b/src/Avalonia.Themes.Default/ScrollBar.xaml
index c9552a607c..05689def0a 100644
--- a/src/Avalonia.Themes.Default/ScrollBar.xaml
+++ b/src/Avalonia.Themes.Default/ScrollBar.xaml
@@ -1,128 +1,140 @@
 <Styles xmlns="https://github.com/avaloniaui">
-    <Style Selector="ScrollBar">
-        <Setter Property="Template">
-            <ControlTemplate>
-                <Border Background="{DynamicResource ThemeControlMidBrush}">
-                    <Grid RowDefinitions="Auto,*,Auto">
-                        <RepeatButton Name="PART_LineUpButton"
-                                      Classes="repeat"
-                                      Grid.Row="0"
-                                      Grid.Column="0"
-                                      Focusable="False">
-                            <Path Data="M 0,4 C0,4 0,6 0,6 0,6 3.5,2.5 3.5,2.5 3.5,2.5 7,6 7,6 7,6 7,4 7,4 7,4 3.5,0.5 3.5,0.5 3.5,0.5 0,4 0,4 z"
-                                  Stretch="Uniform"
-                                  Fill="{DynamicResource ThemeForegroundLowBrush}" />
-                        </RepeatButton>
-                        <Track Grid.Row="1"
-                               Grid.Column="1"
-                               Minimum="{TemplateBinding Minimum}"
-                               Maximum="{TemplateBinding Maximum}"
-                               Value="{TemplateBinding Value, Mode=TwoWay}"
-                               ViewportSize="{TemplateBinding ViewportSize}"
-                               Orientation="{TemplateBinding Orientation}"
-                               IsDirectionReversed="True">
-                            <Track.DecreaseButton>
-                                <RepeatButton Name="PART_PageUpButton"
-                                              Classes="repeattrack"
-                                              Focusable="False"/>
-                            </Track.DecreaseButton>
-                            <Track.IncreaseButton>
-                                <RepeatButton Name="PART_PageDownButton"
-                                              Classes="repeattrack"
-                                              Focusable="False"/>
-                            </Track.IncreaseButton>
-                            <Thumb Name="thumb"/>
-                        </Track>
-                        <RepeatButton Name="PART_LineDownButton"
-                                      Classes="repeat"
-                                      Grid.Row="2"
-                                      Grid.Column="2"
-                                      Focusable="False">
-                            <Path Data="M 0,2.5 C0,2.5 0,0.5 0,0.5 0,0.5 3.5,4 3.5,4 3.5,4 7,0.5 7,0.5 7,0.5 7,2.5 7,2.5 7,2.5 3.5,6 3.5,6 3.5,6 0,2.5 0,2.5 z"
-                                  Stretch="Uniform"
-                                  Fill="{DynamicResource ThemeForegroundLowBrush}" />
-                        </RepeatButton>
-                    </Grid>
-                </Border>
-            </ControlTemplate>
-        </Setter>
-    </Style>
-    <Style Selector="ScrollBar:horizontal">
-        <Setter Property="Height" Value="{DynamicResource ScrollBarThickness}" />
-        <Setter Property="Template">
-            <ControlTemplate>
-                <Border Background="{DynamicResource ThemeControlMidBrush}">
-                    <Grid ColumnDefinitions="Auto,*,Auto">
-                        <RepeatButton Name="PART_LineUpButton"
-                                      Classes="repeat"
-                                      Grid.Row="0"
-                                      Grid.Column="0"
-                                      Focusable="False">
-                            <Path Data="M 3.18,7 C3.18,7 5,7 5,7 5,7 1.81,3.5 1.81,3.5 1.81,3.5 5,0 5,0 5,0 3.18,0 3.18,0 3.18,0 0,3.5 0,3.5 0,3.5 3.18,7 3.18,7 z"
-                                  Stretch="Uniform"
-                                  Fill="{DynamicResource ThemeForegroundLowBrush}" />
-                        </RepeatButton>
-                        <Track Grid.Row="1"
-                               Grid.Column="1"
-                               Minimum="{TemplateBinding Minimum}"
-                               Maximum="{TemplateBinding Maximum}"
-                               Value="{TemplateBinding Value, Mode=TwoWay}"
-                               ViewportSize="{TemplateBinding ViewportSize}"
-                               Orientation="{TemplateBinding Orientation}">
-                            <Track.DecreaseButton>
-                                <RepeatButton Name="PART_PageUpButton"
-                                              Classes="repeattrack"
-                                              Focusable="False"/>
-                            </Track.DecreaseButton>
-                            <Track.IncreaseButton>
-                                <RepeatButton Name="PART_PageDownButton"
-                                              Classes="repeattrack"
-                                              Focusable="False"/>
-                            </Track.IncreaseButton>
-                            <Thumb Name="thumb"/>
-                        </Track>
-                        <RepeatButton Name="PART_LineDownButton"
-                                      Classes="repeat"
-                                      Grid.Row="2"
-                                      Grid.Column="2"
-                                      Focusable="False">
-                            <Path Data="M 1.81,7 C1.81,7 0,7 0,7 0,7 3.18,3.5 3.18,3.5 3.18,3.5 0,0 0,0 0,0 1.81,0 1.81,0 1.81,0 5,3.5 5,3.5 5,3.5 1.81,7 1.81,7 z"
-                                  Stretch="Uniform"
-                                  Fill="{DynamicResource ThemeForegroundLowBrush}" />
-                        </RepeatButton>
-                    </Grid>
-                </Border>
-            </ControlTemplate>
-        </Setter>
-    </Style>
-    <Style Selector="ScrollBar /template/ Thumb#thumb">
-        <Setter Property="Background" Value="{DynamicResource ThemeControlHighBrush}"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate>
-                    <Border Background="{TemplateBinding Background}"/>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-    <Style Selector="ScrollBar:horizontal /template/ Thumb#thumb">
-        <Setter Property="MinWidth" Value="{DynamicResource ScrollBarThickness}" />
-    </Style>
-    <Style Selector="ScrollBar:vertical">
-        <Setter Property="Width" Value="{DynamicResource ScrollBarThickness}" />
-    </Style>
-    <Style Selector="ScrollBar:vertical /template/ Thumb#thumb">
-        <Setter Property="MinHeight" Value="{DynamicResource ScrollBarThickness}" />
-    </Style>
-    <Style Selector="ScrollBar /template/ RepeatButton.repeat">
-        <Setter Property="Padding" Value="2" />
-        <Setter Property="BorderThickness" Value="0" />
-    </Style>
-    <Style Selector="ScrollBar /template/ RepeatButton.repeattrack">
-        <Setter Property="Template">
-            <ControlTemplate>
-                <Border Background="{TemplateBinding Background}" />
-            </ControlTemplate>
-        </Setter>
-    </Style>
+  <Style Selector="ScrollBar">
+    <Setter Property="Cursor" Value="Arrow" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Background="{DynamicResource ThemeControlMidBrush}">
+          <Grid RowDefinitions="Auto,*,Auto">
+            <RepeatButton Name="PART_LineUpButton"
+                          Classes="repeat"
+                          Grid.Row="0"
+                          Focusable="False"
+                          MinHeight="{DynamicResource ScrollBarThickness}">
+              <Path Data="M 1,5 H 11 L 6,0 Z " />
+            </RepeatButton>
+            <Track Grid.Row="1"
+                   Grid.Column="1"
+                   Minimum="{TemplateBinding Minimum}"
+                   Maximum="{TemplateBinding Maximum}"
+                   Value="{TemplateBinding Value, Mode=TwoWay}"
+                   ViewportSize="{TemplateBinding ViewportSize}"
+                   Orientation="{TemplateBinding Orientation}"
+                   IsDirectionReversed="True">
+              <Track.DecreaseButton>
+                <RepeatButton Name="PART_PageUpButton"
+                              Classes="repeattrack"
+                              Focusable="False"/>
+              </Track.DecreaseButton>
+              <Track.IncreaseButton>
+                <RepeatButton Name="PART_PageDownButton"
+                              Classes="repeattrack"
+                              Focusable="False"/>
+              </Track.IncreaseButton>
+              <Thumb Name="thumb"/>
+            </Track>
+            <RepeatButton Name="PART_LineDownButton"
+                          Classes="repeat"
+                          Grid.Row="2"
+                          Grid.Column="2"
+                          Focusable="False"
+                          MinHeight="{DynamicResource ScrollBarThickness}">
+              <Path Data="M 1,0 6,5 11,0 Z" />
+            </RepeatButton>
+          </Grid>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+  </Style>
+  <Style Selector="ScrollBar:horizontal">
+    <Setter Property="Height" Value="{DynamicResource ScrollBarThickness}" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Background="{DynamicResource ThemeControlMidBrush}">
+          <Grid ColumnDefinitions="Auto,*,Auto">
+            <RepeatButton Name="PART_LineUpButton" VerticalAlignment="Center"
+                          Classes="repeat"
+                          Grid.Row="0"
+                          Grid.Column="0"
+                          Focusable="False"
+                          MinWidth="{DynamicResource ScrollBarThickness}">
+              <Path Data="M 5 0 L 5 10 L 0 5 Z" />
+            </RepeatButton>
+            <Track Grid.Row="1"
+                   Grid.Column="1"
+                   Minimum="{TemplateBinding Minimum}"
+                   Maximum="{TemplateBinding Maximum}"
+                   Value="{TemplateBinding Value, Mode=TwoWay}"
+                   ViewportSize="{TemplateBinding ViewportSize}"
+                   Orientation="{TemplateBinding Orientation}">
+              <Track.DecreaseButton>
+                <RepeatButton Name="PART_PageUpButton"
+                              Classes="repeattrack"
+                              Focusable="False"/>
+              </Track.DecreaseButton>
+              <Track.IncreaseButton>
+                <RepeatButton Name="PART_PageDownButton"
+                              Classes="repeattrack"
+                              Focusable="False"/>
+              </Track.IncreaseButton>
+              <Thumb Name="thumb"/>
+            </Track>
+            <RepeatButton Name="PART_LineDownButton" VerticalAlignment="Center"
+                          Classes="repeat"
+                          Grid.Row="2"
+                          Grid.Column="2"
+                          Focusable="False"
+                          MinWidth="{DynamicResource ScrollBarThickness}">
+              <Path Data="M 0 0 L 5 5 L 0 10 Z"  />
+            </RepeatButton>
+          </Grid>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+  </Style>
+  <Style Selector="ScrollBar /template/ Thumb#thumb">
+    <Setter Property="Background" Value="{DynamicResource ThemeControlMidHighBrush}"/>
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate>
+          <Border Background="{TemplateBinding Background}"/>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style Selector="ScrollBar /template/ Thumb#thumb:pointerover">
+    <Setter Property="Background" Value="{DynamicResource ThemeControlHighBrush}"/>
+  </Style>
+  <Style Selector="ScrollBar /template/ Thumb#thumb:pressed">
+    <Setter Property="Background" Value="{DynamicResource ThemeControlVeryHighBrush}"/>
+  </Style>
+  <Style Selector="ScrollBar:horizontal /template/ Thumb#thumb">
+    <Setter Property="MinWidth" Value="{DynamicResource ScrollBarThickness}" />
+    <Setter Property="Height" Value="{DynamicResource ScrollBarThumbThickness}" />
+  </Style>
+  <Style Selector="ScrollBar:vertical">
+    <Setter Property="Width" Value="{DynamicResource ScrollBarThickness}" />
+  </Style>
+  <Style Selector="ScrollBar:vertical /template/ Thumb#thumb">
+    <Setter Property="MinHeight" Value="{DynamicResource ScrollBarThickness}" />
+    <Setter Property="Width" Value="{DynamicResource ScrollBarThumbThickness}" />
+  </Style>
+  <Style Selector="ScrollBar /template/ RepeatButton.repeat">
+    <Setter Property="Padding" Value="2" />
+    <Setter Property="BorderThickness" Value="0" />
+  </Style>
+  <Style Selector="ScrollBar /template/ RepeatButton.repeattrack">
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Background="{TemplateBinding Background}" />
+      </ControlTemplate>
+    </Setter>
+  </Style>
+
+  <Style Selector="ScrollBar /template/ RepeatButton > Path">
+    <Setter Property="Fill" Value="{DynamicResource ThemeForegroundLowBrush}" />
+  </Style>
+
+  <Style Selector="ScrollBar /template/ RepeatButton:pointerover > Path">
+    <Setter Property="Fill" Value="{DynamicResource ThemeAccentBrush}" />
+  </Style>
 </Styles>

From 45028cd2eaeb4d56e3d4348fcaead360739438a7 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Fri, 18 Oct 2019 15:37:06 +0100
Subject: [PATCH 4/7] add 2 extra control colour levels like UWP, will need to
 rename these in 0.10, right now will be a breaking change.

---
 .../Accents/BaseDark.xaml                      |  7 ++++++-
 .../Accents/BaseLight.xaml                     | 18 +++++++++++++-----
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/Avalonia.Themes.Default/Accents/BaseDark.xaml b/src/Avalonia.Themes.Default/Accents/BaseDark.xaml
index 0ed17fae76..fbe74df1b2 100644
--- a/src/Avalonia.Themes.Default/Accents/BaseDark.xaml
+++ b/src/Avalonia.Themes.Default/Accents/BaseDark.xaml
@@ -14,7 +14,9 @@
         <Color x:Key="ThemeBorderHighColor">#FFA0A0A0</Color>
         <Color x:Key="ThemeControlLowColor">#FF282828</Color>
         <Color x:Key="ThemeControlMidColor">#FF505050</Color>
+        <Color x:Key="ThemeControlMidHighColor">#FF686868</Color>
         <Color x:Key="ThemeControlHighColor">#FF808080</Color>
+        <Color x:Key="ThemeControlVeryHighColor">#FFEFEBEF</Color>
         <Color x:Key="ThemeControlHighlightLowColor">#FFA8A8A8</Color>
         <Color x:Key="ThemeControlHighlightMidColor">#FF828282</Color>
         <Color x:Key="ThemeControlHighlightHighColor">#FF505050</Color>
@@ -32,7 +34,9 @@
         <SolidColorBrush x:Key="ThemeBorderHighBrush" Color="{DynamicResource ThemeBorderHighColor}"></SolidColorBrush>
         <SolidColorBrush x:Key="ThemeControlLowBrush" Color="{DynamicResource ThemeControlLowColor}"></SolidColorBrush>
         <SolidColorBrush x:Key="ThemeControlMidBrush" Color="{DynamicResource ThemeControlMidColor}"></SolidColorBrush>
+      <SolidColorBrush x:Key="ThemeControlMidHighBrush" Color="{DynamicResource ThemeControlMidHighColor}"></SolidColorBrush>
         <SolidColorBrush x:Key="ThemeControlHighBrush" Color="{DynamicResource ThemeControlHighColor}"></SolidColorBrush>
+      <SolidColorBrush x:Key="ThemeControlVeryHighBrush" Color="{DynamicResource ThemeControlVeryHighColor}"></SolidColorBrush>
         <SolidColorBrush x:Key="ThemeControlHighlightLowBrush" Color="{DynamicResource ThemeControlHighlightLowColor}"></SolidColorBrush>
         <SolidColorBrush x:Key="ThemeControlHighlightMidBrush" Color="{DynamicResource ThemeControlHighlightMidColor}"></SolidColorBrush>
         <SolidColorBrush x:Key="ThemeControlHighlightHighBrush" Color="{DynamicResource ThemeControlHighlightHighColor}"></SolidColorBrush>
@@ -61,6 +65,7 @@
         <sys:Double x:Key="FontSizeNormal">12</sys:Double>
         <sys:Double x:Key="FontSizeLarge">16</sys:Double>
 
-        <sys:Double x:Key="ScrollBarThickness">10</sys:Double>
+      <sys:Double x:Key="ScrollBarThickness">20</sys:Double>
+      <sys:Double x:Key="ScrollBarThumbThickness">9</sys:Double>
     </Style.Resources>
 </Style>
diff --git a/src/Avalonia.Themes.Default/Accents/BaseLight.xaml b/src/Avalonia.Themes.Default/Accents/BaseLight.xaml
index 3a8a8ec446..2643aae7b2 100644
--- a/src/Avalonia.Themes.Default/Accents/BaseLight.xaml
+++ b/src/Avalonia.Themes.Default/Accents/BaseLight.xaml
@@ -12,10 +12,15 @@
         <Color x:Key="ThemeBorderLowColor">#FFAAAAAA</Color>
         <Color x:Key="ThemeBorderMidColor">#FF888888</Color>
         <Color x:Key="ThemeBorderHighColor">#FF333333</Color>
-        <Color x:Key="ThemeControlLowColor">#FFFFFFFF</Color>
-        <Color x:Key="ThemeControlMidColor">#FFAAAAAA</Color>
-        <Color x:Key="ThemeControlHighColor">#FF888888</Color>
-        <Color x:Key="ThemeControlHighlightLowColor">#FFF0F0F0</Color>
+      
+      
+        <Color x:Key="ThemeControlLowColor">#FF868999</Color>
+        <Color x:Key="ThemeControlMidColor">#FFF5F5F5</Color>
+        <Color x:Key="ThemeControlMidHighColor">#FFC2C3C9</Color>
+        <Color x:Key="ThemeControlHighColor">#FF686868</Color>
+        <Color x:Key="ThemeControlVeryHighColor">#FF5B5B5B</Color>
+
+      <Color x:Key="ThemeControlHighlightLowColor">#FFF0F0F0</Color>
         <Color x:Key="ThemeControlHighlightMidColor">#FFD0D0D0</Color>
         <Color x:Key="ThemeControlHighlightHighColor">#FF808080</Color>
         <Color x:Key="ThemeForegroundColor">#FF000000</Color>
@@ -32,7 +37,9 @@
         <SolidColorBrush x:Key="ThemeBorderHighBrush" Color="{DynamicResource ThemeBorderHighColor}"></SolidColorBrush>
         <SolidColorBrush x:Key="ThemeControlLowBrush" Color="{DynamicResource ThemeControlLowColor}"></SolidColorBrush>
         <SolidColorBrush x:Key="ThemeControlMidBrush" Color="{DynamicResource ThemeControlMidColor}"></SolidColorBrush>
+      <SolidColorBrush x:Key="ThemeControlMidHighBrush" Color="{DynamicResource ThemeControlMidHighColor}"></SolidColorBrush>
         <SolidColorBrush x:Key="ThemeControlHighBrush" Color="{DynamicResource ThemeControlHighColor}"></SolidColorBrush>
+      <SolidColorBrush x:Key="ThemeControlVeryHighBrush" Color="{DynamicResource ThemeControlVeryHighColor}"></SolidColorBrush>
         <SolidColorBrush x:Key="ThemeControlHighlightLowBrush" Color="{DynamicResource ThemeControlHighlightLowColor}"></SolidColorBrush>
         <SolidColorBrush x:Key="ThemeControlHighlightMidBrush" Color="{DynamicResource ThemeControlHighlightMidColor}"></SolidColorBrush>
         <SolidColorBrush x:Key="ThemeControlHighlightHighBrush" Color="{DynamicResource ThemeControlHighlightHighColor}"></SolidColorBrush>
@@ -61,6 +68,7 @@
         <sys:Double x:Key="FontSizeNormal">12</sys:Double>
         <sys:Double x:Key="FontSizeLarge">16</sys:Double>
 
-        <sys:Double x:Key="ScrollBarThickness">10</sys:Double>
+      <sys:Double x:Key="ScrollBarThickness">20</sys:Double>
+      <sys:Double x:Key="ScrollBarThumbThickness">9</sys:Double>
     </Style.Resources>
 </Style>

From 7658791ab9e49c416b3934c60047862a3d1d5b9a Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Fri, 18 Oct 2019 16:52:46 +0100
Subject: [PATCH 5/7] fix centralization of buttons.

---
 src/Avalonia.Themes.Default/ScrollBar.xaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Avalonia.Themes.Default/ScrollBar.xaml b/src/Avalonia.Themes.Default/ScrollBar.xaml
index 05689def0a..856fba00c0 100644
--- a/src/Avalonia.Themes.Default/ScrollBar.xaml
+++ b/src/Avalonia.Themes.Default/ScrollBar.xaml
@@ -5,12 +5,12 @@
       <ControlTemplate>
         <Border Background="{DynamicResource ThemeControlMidBrush}">
           <Grid RowDefinitions="Auto,*,Auto">
-            <RepeatButton Name="PART_LineUpButton"
+            <RepeatButton Name="PART_LineUpButton" HorizontalAlignment="Center"
                           Classes="repeat"
                           Grid.Row="0"
                           Focusable="False"
                           MinHeight="{DynamicResource ScrollBarThickness}">
-              <Path Data="M 1,5 H 11 L 6,0 Z " />
+              <Path Data="M 0 5 L 10 5 L 5 0 Z" />
             </RepeatButton>
             <Track Grid.Row="1"
                    Grid.Column="1"
@@ -32,13 +32,13 @@
               </Track.IncreaseButton>
               <Thumb Name="thumb"/>
             </Track>
-            <RepeatButton Name="PART_LineDownButton"
+            <RepeatButton Name="PART_LineDownButton" HorizontalAlignment="Center"
                           Classes="repeat"
                           Grid.Row="2"
                           Grid.Column="2"
                           Focusable="False"
                           MinHeight="{DynamicResource ScrollBarThickness}">
-              <Path Data="M 1,0 6,5 11,0 Z" />
+              <Path Data="M 0 0 L 5 5 L 10 0 Z" />
             </RepeatButton>
           </Grid>
         </Border>

From ab54a9ced42c7c40c5aa9556e201b4071ccde0b1 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Fri, 18 Oct 2019 16:57:48 +0100
Subject: [PATCH 6/7] fix indentation

---
 src/Avalonia.Themes.Default/Accents/BaseDark.xaml  |  8 ++++----
 src/Avalonia.Themes.Default/Accents/BaseLight.xaml | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Avalonia.Themes.Default/Accents/BaseDark.xaml b/src/Avalonia.Themes.Default/Accents/BaseDark.xaml
index fbe74df1b2..e040ed233e 100644
--- a/src/Avalonia.Themes.Default/Accents/BaseDark.xaml
+++ b/src/Avalonia.Themes.Default/Accents/BaseDark.xaml
@@ -34,9 +34,9 @@
         <SolidColorBrush x:Key="ThemeBorderHighBrush" Color="{DynamicResource ThemeBorderHighColor}"></SolidColorBrush>
         <SolidColorBrush x:Key="ThemeControlLowBrush" Color="{DynamicResource ThemeControlLowColor}"></SolidColorBrush>
         <SolidColorBrush x:Key="ThemeControlMidBrush" Color="{DynamicResource ThemeControlMidColor}"></SolidColorBrush>
-      <SolidColorBrush x:Key="ThemeControlMidHighBrush" Color="{DynamicResource ThemeControlMidHighColor}"></SolidColorBrush>
+        <SolidColorBrush x:Key="ThemeControlMidHighBrush" Color="{DynamicResource ThemeControlMidHighColor}"></SolidColorBrush>
         <SolidColorBrush x:Key="ThemeControlHighBrush" Color="{DynamicResource ThemeControlHighColor}"></SolidColorBrush>
-      <SolidColorBrush x:Key="ThemeControlVeryHighBrush" Color="{DynamicResource ThemeControlVeryHighColor}"></SolidColorBrush>
+        <SolidColorBrush x:Key="ThemeControlVeryHighBrush" Color="{DynamicResource ThemeControlVeryHighColor}"></SolidColorBrush>
         <SolidColorBrush x:Key="ThemeControlHighlightLowBrush" Color="{DynamicResource ThemeControlHighlightLowColor}"></SolidColorBrush>
         <SolidColorBrush x:Key="ThemeControlHighlightMidBrush" Color="{DynamicResource ThemeControlHighlightMidColor}"></SolidColorBrush>
         <SolidColorBrush x:Key="ThemeControlHighlightHighBrush" Color="{DynamicResource ThemeControlHighlightHighColor}"></SolidColorBrush>
@@ -65,7 +65,7 @@
         <sys:Double x:Key="FontSizeNormal">12</sys:Double>
         <sys:Double x:Key="FontSizeLarge">16</sys:Double>
 
-      <sys:Double x:Key="ScrollBarThickness">20</sys:Double>
-      <sys:Double x:Key="ScrollBarThumbThickness">9</sys:Double>
+        <sys:Double x:Key="ScrollBarThickness">20</sys:Double>
+        <sys:Double x:Key="ScrollBarThumbThickness">9</sys:Double>
     </Style.Resources>
 </Style>
diff --git a/src/Avalonia.Themes.Default/Accents/BaseLight.xaml b/src/Avalonia.Themes.Default/Accents/BaseLight.xaml
index 2643aae7b2..b56bd3eaf6 100644
--- a/src/Avalonia.Themes.Default/Accents/BaseLight.xaml
+++ b/src/Avalonia.Themes.Default/Accents/BaseLight.xaml
@@ -20,7 +20,7 @@
         <Color x:Key="ThemeControlHighColor">#FF686868</Color>
         <Color x:Key="ThemeControlVeryHighColor">#FF5B5B5B</Color>
 
-      <Color x:Key="ThemeControlHighlightLowColor">#FFF0F0F0</Color>
+        <Color x:Key="ThemeControlHighlightLowColor">#FFF0F0F0</Color>
         <Color x:Key="ThemeControlHighlightMidColor">#FFD0D0D0</Color>
         <Color x:Key="ThemeControlHighlightHighColor">#FF808080</Color>
         <Color x:Key="ThemeForegroundColor">#FF000000</Color>
@@ -37,9 +37,9 @@
         <SolidColorBrush x:Key="ThemeBorderHighBrush" Color="{DynamicResource ThemeBorderHighColor}"></SolidColorBrush>
         <SolidColorBrush x:Key="ThemeControlLowBrush" Color="{DynamicResource ThemeControlLowColor}"></SolidColorBrush>
         <SolidColorBrush x:Key="ThemeControlMidBrush" Color="{DynamicResource ThemeControlMidColor}"></SolidColorBrush>
-      <SolidColorBrush x:Key="ThemeControlMidHighBrush" Color="{DynamicResource ThemeControlMidHighColor}"></SolidColorBrush>
+        <SolidColorBrush x:Key="ThemeControlMidHighBrush" Color="{DynamicResource ThemeControlMidHighColor}"></SolidColorBrush>
         <SolidColorBrush x:Key="ThemeControlHighBrush" Color="{DynamicResource ThemeControlHighColor}"></SolidColorBrush>
-      <SolidColorBrush x:Key="ThemeControlVeryHighBrush" Color="{DynamicResource ThemeControlVeryHighColor}"></SolidColorBrush>
+        <SolidColorBrush x:Key="ThemeControlVeryHighBrush" Color="{DynamicResource ThemeControlVeryHighColor}"></SolidColorBrush>
         <SolidColorBrush x:Key="ThemeControlHighlightLowBrush" Color="{DynamicResource ThemeControlHighlightLowColor}"></SolidColorBrush>
         <SolidColorBrush x:Key="ThemeControlHighlightMidBrush" Color="{DynamicResource ThemeControlHighlightMidColor}"></SolidColorBrush>
         <SolidColorBrush x:Key="ThemeControlHighlightHighBrush" Color="{DynamicResource ThemeControlHighlightHighColor}"></SolidColorBrush>
@@ -68,7 +68,7 @@
         <sys:Double x:Key="FontSizeNormal">12</sys:Double>
         <sys:Double x:Key="FontSizeLarge">16</sys:Double>
 
-      <sys:Double x:Key="ScrollBarThickness">20</sys:Double>
-      <sys:Double x:Key="ScrollBarThumbThickness">9</sys:Double>
+        <sys:Double x:Key="ScrollBarThickness">20</sys:Double>
+        <sys:Double x:Key="ScrollBarThumbThickness">9</sys:Double>
     </Style.Resources>
 </Style>

From 31e56bc155ed5fb9fb27b5ba2c56ec059248925f Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Fri, 18 Oct 2019 17:11:57 +0100
Subject: [PATCH 7/7] fix centralization of scroll buttons

---
 src/Avalonia.Themes.Default/Accents/BaseDark.xaml  | 4 ++--
 src/Avalonia.Themes.Default/Accents/BaseLight.xaml | 4 ++--
 src/Avalonia.Themes.Default/ScrollBar.xaml         | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Avalonia.Themes.Default/Accents/BaseDark.xaml b/src/Avalonia.Themes.Default/Accents/BaseDark.xaml
index e040ed233e..ffe3e92202 100644
--- a/src/Avalonia.Themes.Default/Accents/BaseDark.xaml
+++ b/src/Avalonia.Themes.Default/Accents/BaseDark.xaml
@@ -65,7 +65,7 @@
         <sys:Double x:Key="FontSizeNormal">12</sys:Double>
         <sys:Double x:Key="FontSizeLarge">16</sys:Double>
 
-        <sys:Double x:Key="ScrollBarThickness">20</sys:Double>
-        <sys:Double x:Key="ScrollBarThumbThickness">9</sys:Double>
+        <sys:Double x:Key="ScrollBarThickness">18</sys:Double>
+        <sys:Double x:Key="ScrollBarThumbThickness">8</sys:Double>
     </Style.Resources>
 </Style>
diff --git a/src/Avalonia.Themes.Default/Accents/BaseLight.xaml b/src/Avalonia.Themes.Default/Accents/BaseLight.xaml
index b56bd3eaf6..c0e5f47eed 100644
--- a/src/Avalonia.Themes.Default/Accents/BaseLight.xaml
+++ b/src/Avalonia.Themes.Default/Accents/BaseLight.xaml
@@ -68,7 +68,7 @@
         <sys:Double x:Key="FontSizeNormal">12</sys:Double>
         <sys:Double x:Key="FontSizeLarge">16</sys:Double>
 
-        <sys:Double x:Key="ScrollBarThickness">20</sys:Double>
-        <sys:Double x:Key="ScrollBarThumbThickness">9</sys:Double>
+        <sys:Double x:Key="ScrollBarThickness">18</sys:Double>
+        <sys:Double x:Key="ScrollBarThumbThickness">8</sys:Double>
     </Style.Resources>
 </Style>
diff --git a/src/Avalonia.Themes.Default/ScrollBar.xaml b/src/Avalonia.Themes.Default/ScrollBar.xaml
index 856fba00c0..64a4399d16 100644
--- a/src/Avalonia.Themes.Default/ScrollBar.xaml
+++ b/src/Avalonia.Themes.Default/ScrollBar.xaml
@@ -10,7 +10,7 @@
                           Grid.Row="0"
                           Focusable="False"
                           MinHeight="{DynamicResource ScrollBarThickness}">
-              <Path Data="M 0 5 L 10 5 L 5 0 Z" />
+              <Path Data="M 0 4 L 8 4 L 4 0 Z" />
             </RepeatButton>
             <Track Grid.Row="1"
                    Grid.Column="1"
@@ -38,7 +38,7 @@
                           Grid.Column="2"
                           Focusable="False"
                           MinHeight="{DynamicResource ScrollBarThickness}">
-              <Path Data="M 0 0 L 5 5 L 10 0 Z" />
+              <Path Data="M 0 0 L 4 4 L 8 0 Z" />
             </RepeatButton>
           </Grid>
         </Border>
@@ -57,7 +57,7 @@
                           Grid.Column="0"
                           Focusable="False"
                           MinWidth="{DynamicResource ScrollBarThickness}">
-              <Path Data="M 5 0 L 5 10 L 0 5 Z" />
+              <Path Data="M 4 0 L 4 8 L 0 4 Z" />
             </RepeatButton>
             <Track Grid.Row="1"
                    Grid.Column="1"
@@ -84,7 +84,7 @@
                           Grid.Column="2"
                           Focusable="False"
                           MinWidth="{DynamicResource ScrollBarThickness}">
-              <Path Data="M 0 0 L 5 5 L 0 10 Z"  />
+              <Path Data="M 0 0 L 4 4 L 0 8 Z"  />
             </RepeatButton>
           </Grid>
         </Border>