From 95bcb537392799720b5be38a1ea93aa57460a921 Mon Sep 17 00:00:00 2001
From: Bastian Schmidt <batzen@gmx.org>
Date: Fri, 11 May 2018 12:21:09 +0200
Subject: [PATCH] Changing default VerticalContentAlignment

---
 Changelog.md                                     | 3 ++-
 Fluent.Ribbon/Themes/Controls/ComboBox.xaml      | 2 ++
 Fluent.Ribbon/Themes/Controls/RibbonTextBox.xaml | 2 ++
 Fluent.Ribbon/Themes/Controls/Spinner.xaml       | 2 ++
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index 35c7046e7..f38110402 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -8,7 +8,8 @@
   - Due to [#549](../../issues/549) `RibbonGroupBox.Header` is now of type object and `RibbonGroupBox` now inherits from `HeaderedItemsControl` instead of `ItemsControl`.  
   Please have a look at the [documentation](http://fluentribbon.github.io/documentation/controls/ribbon-group-box#customizingHeader) for details.
   - Removed `CornerRadius` everywhere except in all controls related to `ApplicationMenu`.
-  - Default `Foreground` for `ComboBox` is now `Fluent.Ribbon.Brushes.LabelTextBrush`.
+  - Default `Foreground` for `ComboBox` changed from `Inherited` to `Fluent.Ribbon.Brushes.LabelTextBrush`.
+  - Default `VerticalContentAlignment` for `ComboBox`, `Spinner` and `TextBox` changed from `Top` to `Center`.
   - Key tips can not be opened by pressing `Space` anymore.
   - The following resources were added, renamed or removed ("---" indicates added when in column "Old" and removed when in column "Old"):
 
diff --git a/Fluent.Ribbon/Themes/Controls/ComboBox.xaml b/Fluent.Ribbon/Themes/Controls/ComboBox.xaml
index 5196c559e..1f089aad2 100644
--- a/Fluent.Ribbon/Themes/Controls/ComboBox.xaml
+++ b/Fluent.Ribbon/Themes/Controls/ComboBox.xaml
@@ -586,6 +586,8 @@
                 Value="{DynamicResource ControlStyleEmptyFocus}" />
         <Setter Property="IsEditable"
                 Value="True" />
+        <Setter Property="VerticalContentAlignment"
+                Value="Center" />
         <Setter Property="ScrollViewer.CanContentScroll"
                 Value="true" />
         <Style.Triggers>
diff --git a/Fluent.Ribbon/Themes/Controls/RibbonTextBox.xaml b/Fluent.Ribbon/Themes/Controls/RibbonTextBox.xaml
index c10b7466f..edb586a94 100644
--- a/Fluent.Ribbon/Themes/Controls/RibbonTextBox.xaml
+++ b/Fluent.Ribbon/Themes/Controls/RibbonTextBox.xaml
@@ -131,6 +131,8 @@
            BasedOn="{StaticResource {x:Type TextBoxBase}}">
         <Setter Property="Template"
                 Value="{DynamicResource Fluent.Ribbon.ControlTemplates.TextBox}" />
+        <Setter Property="VerticalContentAlignment"
+                Value="Center" />
         <Setter Property="FocusVisualStyle"
                 Value="{DynamicResource ControlStyleEmptyFocus}" />
         <Setter Property="Foreground"
diff --git a/Fluent.Ribbon/Themes/Controls/Spinner.xaml b/Fluent.Ribbon/Themes/Controls/Spinner.xaml
index 74bd346d5..e93d55ec8 100644
--- a/Fluent.Ribbon/Themes/Controls/Spinner.xaml
+++ b/Fluent.Ribbon/Themes/Controls/Spinner.xaml
@@ -283,6 +283,8 @@
                 Value="{DynamicResource Fluent.Ribbon.Brushes.LabelTextBrush}" />
         <Setter Property="Focusable"
                 Value="False" />
+        <Setter Property="VerticalContentAlignment"
+                Value="Center" />
         <Setter Property="Template"
                 Value="{DynamicResource Fluent.Ribbon.ControlTemplates.Spinner}" />
     </Style>