Fixes #804 by adding VerticalIconAlignment to RibbonWindow

fluentribbon · Jun 12, 2020 · 3551910 · 3551910
1 parent 1ac2813
commit 3551910
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -25,6 +25,10 @@
   - [#795](../../issues/795) - Check mark of menuitem not visible
   - [#798](../../issues/798) - The elements in the ribbon use ElementName = xxx to bind the data and cannot find the xxx element
 
+- ### Enhancements/Features
+  - [#804](../../issues/804) - Ribbon Window's Icon Not Centered  
+  Added `VerticalIconAlignment` to `RibbonWindow`
+
 ## 7.1.0
 
 - ### Bug fixes

diff --git a/Fluent.Ribbon/Controls/RibbonWindow.cs b/Fluent.Ribbon/Controls/RibbonWindow.cs
@@ -172,18 +172,28 @@ public Brush NonActiveBorderBrush
         #endregion
 
         /// <summary>
-        /// Gets or sets whether icon is visible
+        /// Gets or sets whether icon is visible.
         /// </summary>
         public bool IsIconVisible
         {
             get { return (bool)this.GetValue(IsIconVisibleProperty); }
             set { this.SetValue(IsIconVisibleProperty, value); }
         }
 
+        /// <summary>Identifies the <see cref="IsIconVisible"/> dependency property.</summary>
+        public static readonly DependencyProperty IsIconVisibleProperty = DependencyProperty.Register(nameof(IsIconVisible), typeof(bool), typeof(RibbonWindow), new FrameworkPropertyMetadata(BooleanBoxes.TrueBox));
+
         /// <summary>
-        /// Gets or sets whether icon is visible
+        /// Gets or sets the vertical alignment of the icon.
         /// </summary>
-        public static readonly DependencyProperty IsIconVisibleProperty = DependencyProperty.Register(nameof(IsIconVisible), typeof(bool), typeof(RibbonWindow), new FrameworkPropertyMetadata(BooleanBoxes.TrueBox));
+        public VerticalAlignment VerticalIconAlignment
+        {
+            get { return (VerticalAlignment)this.GetValue(VerticalIconAlignmentProperty); }
+            set { this.SetValue(VerticalIconAlignmentProperty, value); }
+        }
+
+        /// <summary>Identifies the <see cref="VerticalIconAlignment"/> dependency property.</summary>
+        public static readonly DependencyProperty VerticalIconAlignmentProperty = DependencyProperty.Register(nameof(VerticalIconAlignment), typeof(VerticalAlignment), typeof(RibbonWindow), new PropertyMetadata(VerticalAlignment.Top));
 
         // todo check if IsCollapsed and IsAutomaticCollapseEnabled should be reduced to one shared property for RibbonWindow and Ribbon
 

diff --git a/Fluent.Ribbon/Themes/RibbonWindow.xaml b/Fluent.Ribbon/Themes/RibbonWindow.xaml
@@ -30,7 +30,7 @@
                                Height="16"
                                Width="16"
                                Margin="4,2,0,0"
-                               VerticalAlignment="Top"
+                               VerticalAlignment="{TemplateBinding VerticalIconAlignment}"
                                Stretch="Uniform"
                                Visibility="{TemplateBinding IsIconVisible, Converter={StaticResource BooleanToVisibilityConverter}}"
                                Source="{Fluent:IconConverter {Binding Icon, RelativeSource={RelativeSource TemplatedParent}}, {Binding RelativeSource={RelativeSource Self}}}"