From 7d28b510d7c792a118a30bdc05a3d330774f02c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roland=20So=C3=B3s?= <soos.roland93@gmail.com>
Date: Fri, 9 Oct 2020 11:13:30 +0200
Subject: [PATCH 1/9] Update TextBox.xaml

Set CornerRadius via style on TextBox
---
 src/Avalonia.Themes.Fluent/TextBox.xaml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Avalonia.Themes.Fluent/TextBox.xaml b/src/Avalonia.Themes.Fluent/TextBox.xaml
index 85364bffea..162835ae10 100644
--- a/src/Avalonia.Themes.Fluent/TextBox.xaml
+++ b/src/Avalonia.Themes.Fluent/TextBox.xaml
@@ -52,7 +52,6 @@
               Background="{TemplateBinding Background}"
               BorderBrush="{TemplateBinding BorderBrush}"
               BorderThickness="{TemplateBinding BorderThickness}"
-              CornerRadius="{DynamicResource ControlCornerRadius}"
               MinWidth="{TemplateBinding MinWidth}"
               MinHeight="{TemplateBinding MinHeight}">
             </Border>
@@ -156,6 +155,10 @@
     <Setter Property="BorderBrush" Value="{DynamicResource SystemControlErrorTextForegroundBrush}"/>
   </Style>
 
+  <Style Selector="TextBox /template/ Border#PART_BorderElement">
+    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+  </Style>
+
   <Style Selector="TextBox /template/ DockPanel#PART_InnerDockPanel">
     <Setter Property="Cursor" Value="IBeam" />
   </Style>

From 31d8ada74b25d85374d439a9222a0646962df16a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roland=20So=C3=B3s?= <soos.roland93@gmail.com>
Date: Mon, 12 Oct 2020 11:21:02 +0200
Subject: [PATCH 2/9] Update ComboBox.xaml

---
 src/Avalonia.Themes.Fluent/ComboBox.xaml | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/ComboBox.xaml b/src/Avalonia.Themes.Fluent/ComboBox.xaml
index f77f1b582b..8155264f18 100644
--- a/src/Avalonia.Themes.Fluent/ComboBox.xaml
+++ b/src/Avalonia.Themes.Fluent/ComboBox.xaml
@@ -61,7 +61,6 @@
                   Background="{TemplateBinding Background}"
                   BorderBrush="{TemplateBinding BorderBrush}"
                   BorderThickness="{TemplateBinding BorderThickness}"
-                  CornerRadius="{DynamicResource ControlCornerRadius}"
                   MinWidth="{DynamicResource ComboBoxThemeMinWidth}" />
 
           <Border x:Name="HighlightBackground"
@@ -70,8 +69,7 @@
                   Grid.ColumnSpan="2"
                   Background="{DynamicResource ComboBoxBackgroundUnfocused}"
                   BorderBrush="{DynamicResource ComboBoxBackgroundBorderBrushUnfocused}"
-                  BorderThickness="{TemplateBinding BorderThickness}"
-                  CornerRadius="{DynamicResource ControlCornerRadius}" />
+                  BorderThickness="{TemplateBinding BorderThickness}" />
           <TextBlock x:Name="PlaceholderTextBlock"
                      Grid.Row="1"
                      Grid.Column="0"
@@ -226,4 +224,12 @@
   <Style Selector="ComboBox:focused:pressed /template/ Path#DropDownGlyph">
     <Setter Property="Fill" Value="{DynamicResource ComboBoxDropDownGlyphForegroundFocusedPressed}" />
   </Style>
+  
+  <Style Selector="ComboBox /template/ Border#Background">
+    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+  </Style>
+  
+  <Style Selector="ComboBox /template/ Border#HighlightBackground">
+    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+  </Style>
 </Styles>

From 09fd6650ac13a728210fc35b71664265c6b30fdf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roland=20So=C3=B3s?= <soos.roland93@gmail.com>
Date: Mon, 12 Oct 2020 11:32:04 +0200
Subject: [PATCH 3/9] Update Button.xaml

CornerRadius via style
---
 src/Avalonia.Themes.Fluent/Button.xaml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Avalonia.Themes.Fluent/Button.xaml b/src/Avalonia.Themes.Fluent/Button.xaml
index 8522c933ae..573b9f337f 100644
--- a/src/Avalonia.Themes.Fluent/Button.xaml
+++ b/src/Avalonia.Themes.Fluent/Button.xaml
@@ -32,7 +32,6 @@
                           BorderThickness="{TemplateBinding BorderThickness}"
                           Content="{TemplateBinding Content}"
                           ContentTemplate="{TemplateBinding ContentTemplate}"
-                          CornerRadius="{DynamicResource ControlCornerRadius}"
                           Padding="{TemplateBinding Padding}"
                           HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                           VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
@@ -95,4 +94,8 @@
     <Setter Property="BorderBrush" Value="{DynamicResource AccentButtonBorderBrushDisabled}" />
     <Setter Property="TextBlock.Foreground" Value="{DynamicResource AccentButtonForegroundDisabled}" />
   </Style>
+  
+  <Style Selector="Button /template/ ContentPresenter#PART_ContentPresenter">
+    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+  </Style>
 </Styles>

From 4aa9264daabf5e81b05b05decce7a7dc5e807a27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roland=20So=C3=B3s?= <soos.roland93@gmail.com>
Date: Mon, 12 Oct 2020 11:36:26 +0200
Subject: [PATCH 4/9] CheckBox CornerRadius via style

---
 src/Avalonia.Themes.Fluent/CheckBox.xaml | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/CheckBox.xaml b/src/Avalonia.Themes.Fluent/CheckBox.xaml
index 678ae5c5a3..83d2779872 100644
--- a/src/Avalonia.Themes.Fluent/CheckBox.xaml
+++ b/src/Avalonia.Themes.Fluent/CheckBox.xaml
@@ -22,16 +22,14 @@
                   Grid.ColumnSpan="2"
                   Background="{TemplateBinding Background}"
                   BorderBrush="{TemplateBinding BorderBrush}"
-                  BorderThickness="{TemplateBinding BorderThickness}"
-                  CornerRadius="{DynamicResource ControlCornerRadius}" />
+                  BorderThickness="{TemplateBinding BorderThickness}" />
 
           <Grid VerticalAlignment="Top" Height="32">
             <Border x:Name="NormalRectangle"
                 BorderThickness="{DynamicResource CheckBoxBorderThemeThickness}"
                 UseLayoutRounding="False"
                 Height="20"
-                Width="20"
-                CornerRadius="{DynamicResource ControlCornerRadius}" />
+                Width="20" />
 
             <Viewbox UseLayoutRounding="False">
               <Panel>
@@ -52,6 +50,14 @@
       </ControlTemplate>
     </Setter>
   </Style>
+  
+  <Style Selector="CheckBox /template/ Border#PART_Border">
+    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+  </Style>
+
+  <Style Selector="CheckBox /template/ Border#NormalRectangle">
+    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+  </Style>
 
   <!-- Unchecked Normal State -->
   <Style Selector="CheckBox">

From 707980cf4a027f869c30dba035bfea358e198926 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roland=20So=C3=B3s?= <soos.roland93@gmail.com>
Date: Mon, 12 Oct 2020 11:39:06 +0200
Subject: [PATCH 5/9] TabStripItem CornerRadius via style

---
 src/Avalonia.Themes.Fluent/TabStripItem.xaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Avalonia.Themes.Fluent/TabStripItem.xaml b/src/Avalonia.Themes.Fluent/TabStripItem.xaml
index 628ab8dddd..78ef102705 100644
--- a/src/Avalonia.Themes.Fluent/TabStripItem.xaml
+++ b/src/Avalonia.Themes.Fluent/TabStripItem.xaml
@@ -38,7 +38,6 @@
                               TextBlock.FontSize="{TemplateBinding FontSize}"
                               TextBlock.FontWeight="{TemplateBinding FontWeight}" />
             <Border Name="PART_SelectedPipe"
-                    CornerRadius="{DynamicResource ControlCornerRadius}"
                     Background="{DynamicResource TabItemHeaderSelectedPipeFill}" />
           </Panel>
         </Border>
@@ -46,6 +45,9 @@
     </Setter>
   </Style>
 
+  <Style Selector="TabStripItem /template/ Border#PART_SelectedPipe">
+    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+  </Style>
 
   <!--  Nornal state  -->
   <Style Selector="TabStripItem /template/ Border#PART_LayoutRoot">

From 04eae1ce41bcc1e64ae3a6da6a1c328d0d5dc645 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roland=20So=C3=B3s?= <soos.roland93@gmail.com>
Date: Mon, 12 Oct 2020 11:41:07 +0200
Subject: [PATCH 6/9] ToggleButton CornerRadius via style

---
 src/Avalonia.Themes.Fluent/ToggleButton.xaml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Avalonia.Themes.Fluent/ToggleButton.xaml b/src/Avalonia.Themes.Fluent/ToggleButton.xaml
index 49e2280a6d..dd8e51e4e5 100644
--- a/src/Avalonia.Themes.Fluent/ToggleButton.xaml
+++ b/src/Avalonia.Themes.Fluent/ToggleButton.xaml
@@ -29,7 +29,6 @@
                           Background="{TemplateBinding Background}"
                           BorderBrush="{TemplateBinding BorderBrush}"
                           BorderThickness="{TemplateBinding BorderThickness}"
-                          CornerRadius="{DynamicResource ControlCornerRadius}"
                           Content="{TemplateBinding Content}"
                           ContentTemplate="{TemplateBinding ContentTemplate}"
                           Padding="{TemplateBinding Padding}"
@@ -38,6 +37,10 @@
       </ControlTemplate>
     </Setter>
   </Style>
+  
+  <Style Selector="ToggleButton /template/ ContentPresenter#PART_ContentPresenter">
+    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+  </Style>
 
   <Style Selector="ToggleButton:pointerover /template/ ContentPresenter#PART_ContentPresenter">
     <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundPointerOver}" />

From 61c6e0cc750bb315bceafd9db994ff67ec7f0465 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roland=20So=C3=B3s?= <soos.roland93@gmail.com>
Date: Mon, 12 Oct 2020 11:42:57 +0200
Subject: [PATCH 7/9] RadioButton CornerRadius via style

---
 src/Avalonia.Themes.Fluent/RadioButton.xaml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/RadioButton.xaml b/src/Avalonia.Themes.Fluent/RadioButton.xaml
index 078f51c87a..2847d1fa5a 100644
--- a/src/Avalonia.Themes.Fluent/RadioButton.xaml
+++ b/src/Avalonia.Themes.Fluent/RadioButton.xaml
@@ -25,8 +25,7 @@
         <Border Name="RootBorder"
                 Background="{TemplateBinding Background}"
                 BorderBrush="{TemplateBinding BorderBrush}"
-                BorderThickness="{TemplateBinding BorderThickness}"
-                CornerRadius="{DynamicResource ControlCornerRadius}">
+                BorderThickness="{TemplateBinding BorderThickness}">
           <Grid ColumnDefinitions="20,*">
             <Grid VerticalAlignment="Top"
               Height="32">
@@ -77,6 +76,10 @@
     <Setter Property="Stroke" Value="{DynamicResource RadioButtonCheckGlyphStroke}" />
     <Setter Property="Fill" Value="{DynamicResource RadioButtonCheckGlyphFill}" />
   </Style>
+  
+  <Style Selector="RadioButton /template/ Border#RootBorder">
+    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+  </Style>
 
 
   <!-- PointerOver State -->

From 1d2cf0280e71356ff4ed1176bff694ceb7851e2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roland=20So=C3=B3s?= <soos.roland93@gmail.com>
Date: Mon, 12 Oct 2020 11:48:35 +0200
Subject: [PATCH 8/9] TabItem CornerRadius via style

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

diff --git a/src/Avalonia.Themes.Fluent/TabItem.xaml b/src/Avalonia.Themes.Fluent/TabItem.xaml
index 2b0a0c1ea0..ca8d4dfeb5 100644
--- a/src/Avalonia.Themes.Fluent/TabItem.xaml
+++ b/src/Avalonia.Themes.Fluent/TabItem.xaml
@@ -39,7 +39,6 @@
                               TextBlock.FontSize="{TemplateBinding FontSize}"
                               TextBlock.FontWeight="{TemplateBinding FontWeight}" />
             <Border Name="PART_SelectedPipe"
-                    CornerRadius="{DynamicResource ControlCornerRadius}"
                     Background="{DynamicResource TabItemHeaderSelectedPipeFill}" />
           </Panel>
         </Border>
@@ -53,6 +52,7 @@
   </Style>
   <Style Selector="TabItem /template/ Border#PART_SelectedPipe">
     <Setter Property="IsVisible" Value="False" />
+	<Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
   </Style>
 
   <!-- Selected state -->

From 0329cf5d9f2177a7c23b4164a24958e02cb81982 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roland=20So=C3=B3s?= <soos.roland93@gmail.com>
Date: Mon, 12 Oct 2020 11:55:49 +0200
Subject: [PATCH 9/9] format

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

diff --git a/src/Avalonia.Themes.Fluent/TabItem.xaml b/src/Avalonia.Themes.Fluent/TabItem.xaml
index ca8d4dfeb5..1c9574f169 100644
--- a/src/Avalonia.Themes.Fluent/TabItem.xaml
+++ b/src/Avalonia.Themes.Fluent/TabItem.xaml
@@ -52,7 +52,7 @@
   </Style>
   <Style Selector="TabItem /template/ Border#PART_SelectedPipe">
     <Setter Property="IsVisible" Value="False" />
-	<Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
   </Style>
 
   <!-- Selected state -->