From ec28838b9c2b36a508bdafe3e79d0cf839049719 Mon Sep 17 00:00:00 2001
From: Bastian Schmidt <batzen@gmx.org>
Date: Sun, 20 Oct 2024 09:32:28 +0200
Subject: [PATCH 01/11] Improving showcase

---
 Fluent.Ribbon.Showcase/TestContent.xaml | 85 ++++++++++++-------------
 1 file changed, 39 insertions(+), 46 deletions(-)

diff --git a/Fluent.Ribbon.Showcase/TestContent.xaml b/Fluent.Ribbon.Showcase/TestContent.xaml
index 88392462..be2d18e6 100644
--- a/Fluent.Ribbon.Showcase/TestContent.xaml
+++ b/Fluent.Ribbon.Showcase/TestContent.xaml
@@ -3156,20 +3156,17 @@
                                                          SelectedItem="{Binding Source={x:Static controlzEx:ThemeManager.Current}, Path=ThemeSyncMode}" />
                                         <Fluent:CheckBox Header="Use HSL color"
                                                          IsChecked="{Binding Path=Options.UseHSL, Source={x:Static controlzEx:RuntimeThemeGenerator.Current}, Mode=TwoWay}" />
-                                        <Button Click="SyncThemeNow_OnClick">Sync now</Button>
+                                        <Fluent:Button Header="Sync now" Size="Middle" Click="SyncThemeNow_OnClick" />
                                     </WrapPanel>
                                 </GroupBox>
 
                                 <GroupBox Header="WindowChrome">
                                     <WrapPanel>
-                                        <StackPanel Orientation="Horizontal">
-                                            <Label>
-                                                CornerPreference
-                                            </Label>
-                                            <ComboBox VerticalAlignment="Center"
-                                                      ItemsSource="{Binding Source={StaticResource CornerPreferenceEnumValues}}"
-                                                      SelectedItem="{Binding RelativeSource={RelativeSource AncestorType=controlzEx:WindowChromeWindow}, Path=CornerPreference, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
-                                        </StackPanel>
+                                        <Fluent:ComboBox Header="CornerPreference"
+                                                         IsEditable="False"
+                                                         VerticalAlignment="Center"
+                                                         ItemsSource="{Binding Source={StaticResource CornerPreferenceEnumValues}}"
+                                                         SelectedItem="{Binding RelativeSource={RelativeSource AncestorType=controlzEx:WindowChromeWindow}, Path=CornerPreference, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
                                     </WrapPanel>
                                 </GroupBox>
 
@@ -3233,31 +3230,27 @@
                                             </Fluent:ComboBox.ItemTemplate>
                                         </Fluent:ComboBox>
 
-                                        <StackPanel Orientation="Horizontal">
-                                            <Label>
-                                                GlowDepth
-                                            </Label>
-                                            <TextBox MinWidth="30"
-                                                     VerticalAlignment="Center"
-                                                     Text="{Binding RelativeSource={RelativeSource AncestorType=controlzEx:WindowChromeWindow}, Path=GlowDepth, Mode=TwoWay}" />
-                                        </StackPanel>
+                                        <Fluent:TextBox Header="GlowDepth"
+                                                        MinWidth="30"
+                                                        VerticalAlignment="Center"
+                                                        Text="{Binding RelativeSource={RelativeSource AncestorType=controlzEx:WindowChromeWindow}, Path=GlowDepth, Mode=TwoWay}" />
 
-                                        <CheckBox VerticalAlignment="Center"
-                                                  Content="IsGlowTransitionEnabled"
-                                                  IsChecked="{Binding RelativeSource={RelativeSource AncestorType=controlzEx:WindowChromeWindow}, Path=IsGlowTransitionEnabled, Mode=TwoWay}" />
+                                        <Fluent:CheckBox VerticalAlignment="Center"
+                                                         Header="IsGlowTransitionEnabled"
+                                                         IsChecked="{Binding RelativeSource={RelativeSource AncestorType=controlzEx:WindowChromeWindow}, Path=IsGlowTransitionEnabled, Mode=TwoWay}" />
 
-                                        <CheckBox VerticalAlignment="Center"
-                                                  Content="UseRadialGradientForCorners"
-                                                  IsChecked="{Binding RelativeSource={RelativeSource AncestorType=controlzEx:WindowChromeWindow}, Path=UseRadialGradientForCorners, Mode=TwoWay}" />
+                                        <Fluent:CheckBox VerticalAlignment="Center"
+                                                         Header="UseRadialGradientForCorners"
+                                                         IsChecked="{Binding RelativeSource={RelativeSource AncestorType=controlzEx:WindowChromeWindow}, Path=UseRadialGradientForCorners, Mode=TwoWay}" />
 
-                                        <CheckBox VerticalAlignment="Center"
-                                                  Content="PreferDWMBorderColor"
-                                                  IsChecked="{Binding RelativeSource={RelativeSource AncestorType=controlzEx:WindowChromeWindow}, Path=PreferDWMBorderColor, Mode=TwoWay}" />
+                                        <Fluent:CheckBox VerticalAlignment="Center"
+                                                         Header="PreferDWMBorderColor"
+                                                         IsChecked="{Binding RelativeSource={RelativeSource AncestorType=controlzEx:WindowChromeWindow}, Path=PreferDWMBorderColor, Mode=TwoWay}" />
 
-                                        <CheckBox VerticalAlignment="Center"
-                                                  Content="DWMSupportsBorderColor"
-                                                  IsChecked="{Binding RelativeSource={RelativeSource AncestorType=controlzEx:WindowChromeWindow}, Path=DWMSupportsBorderColor, Mode=OneWay}"
-                                                  IsEnabled="False" />
+                                        <Fluent:CheckBox VerticalAlignment="Center"
+                                                         Header="DWMSupportsBorderColor"
+                                                         IsChecked="{Binding RelativeSource={RelativeSource AncestorType=controlzEx:WindowChromeWindow}, Path=DWMSupportsBorderColor, Mode=OneWay}"
+                                                         IsEnabled="False" />
                                     </WrapPanel>
                                 </GroupBox>
 
@@ -3312,26 +3305,25 @@
                                                          IsChecked="True">
                                             IsStatusBarVisible
                                         </Fluent:CheckBox>
-                                        <ComboBox AutomationProperties.Name="Window resize mode"
-                                                  ItemsSource="{Binding Source={StaticResource ResizeModeEnumValues}}"
-                                                  SelectedItem="{Binding Path=ResizeMode, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, RelativeSource={RelativeSource AncestorType={x:Type Window}}}" />
+                                        <Fluent:ComboBox Header="Window resize mode"
+                                                         IsEditable="False"
+                                                         ItemsSource="{Binding Source={StaticResource ResizeModeEnumValues}}"
+                                                         SelectedItem="{Binding Path=ResizeMode, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, RelativeSource={RelativeSource AncestorType={x:Type Window}}}" />
 
-                                        <ComboBox AutomationProperties.Name="Window flow direction"
-                                                  ItemsSource="{Binding Source={StaticResource FlowDirectionEnumValues}}"
-                                                  SelectedItem="{Binding Path=FlowDirection, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, RelativeSource={RelativeSource AncestorType={x:Type Window}}}" />
+                                        <Fluent:ComboBox Header="Window flow direction"
+                                                         IsEditable="False"
+                                                         ItemsSource="{Binding Source={StaticResource FlowDirectionEnumValues}}"
+                                                         SelectedItem="{Binding Path=FlowDirection, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, RelativeSource={RelativeSource AncestorType={x:Type Window}}}" />
 
                                         <Fluent:CheckBox IsChecked="{Binding Path=IgnoreTaskbarOnMaximize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, RelativeSource={RelativeSource AncestorType={x:Type Fluent:RibbonWindow}}, FallbackValue=False}">
                                             IgnoreTaskbarOnMaximize
                                         </Fluent:CheckBox>
 
-                                        <StackPanel Orientation="Horizontal">
-                                            <Label>
-                                                BackDropType
-                                            </Label>
-                                            <ComboBox VerticalAlignment="Center"
-                                                      ItemsSource="{Binding Source={StaticResource WindowBackdropTypeEnumValues}}"
-                                                      SelectedItem="{Binding Path=(controlzEx:WindowBackdropManager.BackdropType), Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, RelativeSource={RelativeSource AncestorType={x:Type Window}}}" />
-                                        </StackPanel>
+                                        <Fluent:ComboBox Header="BackdropType"
+                                                         IsEditable="False"
+                                                         VerticalAlignment="Center"
+                                                         ItemsSource="{Binding Source={StaticResource WindowBackdropTypeEnumValues}}"
+                                                         SelectedItem="{Binding Path=(controlzEx:WindowBackdropManager.BackdropType), Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, RelativeSource={RelativeSource AncestorType={x:Type Window}}}" />
                                     </WrapPanel>
                                 </GroupBox>
 
@@ -3401,8 +3393,9 @@
                                 </GroupBox>
 
                                 <GroupBox Header="Commands">
-                                    <Button Click="HandleResetSavedState_OnClick"
-                                            Content="Reset saved state &amp; restart" />
+                                    <Fluent:Button Click="HandleResetSavedState_OnClick"
+                                                   Header="Reset saved state &amp; restart"
+                                                   Size="Middle" />
                                 </GroupBox>
                             </StackPanel>
                         </GroupBox>

From 9e19ffebccee6f38a6811ec931db1d6df5c5421b Mon Sep 17 00:00:00 2001
From: Bastian Schmidt <batzen@gmx.org>
Date: Fri, 25 Oct 2024 16:52:52 +0200
Subject: [PATCH 02/11] Adding ExpandButtonContent and
 ExpandButtonContentTemplate to InRibbonGallery

---
 Changelog.md                                  |  1 +
 Fluent.Ribbon.Showcase/TestContent.xaml       |  8 ++-
 Fluent.Ribbon/Controls/InRibbonGallery.cs     | 26 ++++++++++
 .../Themes/Controls/InRibbonGallery.xaml      | 49 ++++++++++++-------
 4 files changed, 65 insertions(+), 19 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 564d8f52..6a0a72f8 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -76,6 +76,7 @@
     - `IsSplit` is now automatically set by a style trigger. If `Command` is not null and `HasItems` is true.
   - `RibbonMenu`
     - Added support for `UsesItemContainerTemplate` and `ItemContainerTemplateSelector`
+  - Added `ExpandButtonContent` and `ExpandButtonContentTemplate` to `InRibbonGallery`
 
 - ### Bug fixes
 
diff --git a/Fluent.Ribbon.Showcase/TestContent.xaml b/Fluent.Ribbon.Showcase/TestContent.xaml
index be2d18e6..bd375ef4 100644
--- a/Fluent.Ribbon.Showcase/TestContent.xaml
+++ b/Fluent.Ribbon.Showcase/TestContent.xaml
@@ -2190,7 +2190,13 @@
                                             MinItemsInRow="3"
                                             ResizeMode="Both"
                                             Selectable="False"
-                                            ToolTip="Items are not selectable here.">
+                                            ToolTip="Items are not selectable here."
+                                            ExpandButtonContent="{Binding DataItems.Count}">
+                        <Fluent:InRibbonGallery.ExpandButtonContentTemplate>
+                            <DataTemplate>
+                                <ContentControl HorizontalAlignment="Center" VerticalAlignment="Center" Content="{Binding .}" />
+                            </DataTemplate>
+                        </Fluent:InRibbonGallery.ExpandButtonContentTemplate>
                         <!-- You can also add items to context menu -->
                         <Fluent:InRibbonGallery.Menu>
                             <Fluent:RibbonMenu>
diff --git a/Fluent.Ribbon/Controls/InRibbonGallery.cs b/Fluent.Ribbon/Controls/InRibbonGallery.cs
index 48183fab..f07f74f1 100644
--- a/Fluent.Ribbon/Controls/InRibbonGallery.cs
+++ b/Fluent.Ribbon/Controls/InRibbonGallery.cs
@@ -1012,6 +1012,32 @@ public bool IsSimplified
 
     #endregion
 
+    /// <summary>Identifies the <see cref="ExpandButtonContent"/> dependency property.</summary>
+    public static readonly DependencyProperty ExpandButtonContentProperty = DependencyProperty.Register(
+        nameof(ExpandButtonContent), typeof(object), typeof(InRibbonGallery), new PropertyMetadata(StringBoxes.Empty));
+
+    /// <summary>
+    /// todo
+    /// </summary>
+    public object? ExpandButtonContent
+    {
+        get => (object?)this.GetValue(ExpandButtonContentProperty);
+        set => this.SetValue(ExpandButtonContentProperty, value);
+    }
+
+    /// <summary>Identifies the <see cref="ExpandButtonContentTemplate"/> dependency property.</summary>
+    public static readonly DependencyProperty ExpandButtonContentTemplateProperty = DependencyProperty.Register(
+        nameof(ExpandButtonContentTemplate), typeof(DataTemplate), typeof(InRibbonGallery), new PropertyMetadata(default(DataTemplate)));
+
+    /// <summary>
+    /// todo
+    /// </summary>
+    public DataTemplate? ExpandButtonContentTemplate
+    {
+        get => (DataTemplate?)this.GetValue(ExpandButtonContentTemplateProperty);
+        set => this.SetValue(ExpandButtonContentTemplateProperty, value);
+    }
+
     #endregion Properties
 
     #region Events
diff --git a/Fluent.Ribbon/Themes/Controls/InRibbonGallery.xaml b/Fluent.Ribbon/Themes/Controls/InRibbonGallery.xaml
index e707717d..315154f0 100644
--- a/Fluent.Ribbon/Themes/Controls/InRibbonGallery.xaml
+++ b/Fluent.Ribbon/Themes/Controls/InRibbonGallery.xaml
@@ -263,26 +263,15 @@
                             Background="{DynamicResource Fluent.Ribbon.Brushes.White}"
                             BorderBrush="{DynamicResource Fluent.Ribbon.Brushes.Control.Border}"
                             BorderThickness="{TemplateBinding BorderThickness}">
-                        <Grid x:Name="grid">
-                            <Path Width="10"
-                                  Height="2"
-                                  Margin="0 2 0 0"
-                                  HorizontalAlignment="Center"
-                                  VerticalAlignment="Top"
-                                  Data="M0,0L1,0"
-                                  Stretch="Fill"
-                                  Stroke="{DynamicResource Fluent.Ribbon.Brushes.Black}"
-                                  StrokeThickness="2" />
-                            <Path Style="{DynamicResource Fluent.Ribbon.Styles.Path.Arrow.UpDown}"
-                                  Margin="0 0 0 4"
-                                  VerticalAlignment="Bottom"
-                                  Data="{DynamicResource Fluent.Ribbon.Values.Arrow.Down}"
-                                  Stroke="{DynamicResource Fluent.Ribbon.Brushes.Black}" />
-                        </Grid>
+                        <ContentControl x:Name="PART_HeaderContentHost"
+                                        Content="{TemplateBinding Header}"
+                                        ContentTemplate="{TemplateBinding HeaderTemplate}"
+                                        ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}"
+                                        Focusable="False" />
                     </Border>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsEnabled" Value="False">
-                            <Setter TargetName="grid" Property="Opacity" Value="0.5" />
+                            <Setter TargetName="PART_HeaderContentHost" Property="Opacity" Value="0.5" />
                         </Trigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
@@ -481,7 +470,9 @@
                                          CanAddToQuickAccessToolBar="False"
                                          ClickMode="Press"
                                          IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
-                                         IsDefinitive="False" />
+                                         IsDefinitive="False"
+                                         Header="{TemplateBinding ExpandButtonContent}"
+                                         HeaderTemplate="{TemplateBinding ExpandButtonContentTemplate}" />
 
                     <Popup x:Name="PART_Popup"
                            Grid.ColumnSpan="2"
@@ -607,6 +598,28 @@
         <Setter Property="Focusable" Value="False" />
         <Setter Property="Margin" Value="{DynamicResource Fluent.Ribbon.Values.Default.Margin}" />
         <Setter Property="Template" Value="{DynamicResource Fluent.Ribbon.Templates.InRibbonGallery}" />
+        <Setter Property="ExpandButtonContentTemplate">
+            <Setter.Value>
+                <DataTemplate>
+                    <Grid x:Name="grid">
+                        <Path Width="10"
+                              Height="2"
+                              Margin="0 2 0 0"
+                              HorizontalAlignment="Center"
+                              VerticalAlignment="Top"
+                              Data="M0,0L1,0"
+                              Stretch="Fill"
+                              Stroke="{DynamicResource Fluent.Ribbon.Brushes.Black}"
+                              StrokeThickness="2" />
+                        <Path Style="{DynamicResource Fluent.Ribbon.Styles.Path.Arrow.UpDown}"
+                              Margin="0 0 0 4"
+                              VerticalAlignment="Bottom"
+                              Data="{DynamicResource Fluent.Ribbon.Values.Arrow.Down}"
+                              Stroke="{DynamicResource Fluent.Ribbon.Brushes.Black}" />
+                    </Grid>
+                </DataTemplate>
+            </Setter.Value>
+        </Setter>
         <Style.Triggers>
             <Trigger Property="Size" Value="Large">
                 <Setter Property="Height" Value="68" />

From 8bfd879d3ea4345d1d76e5ba428a27ec0abcd8a3 Mon Sep 17 00:00:00 2001
From: Bastian Schmidt <batzen@gmx.org>
Date: Sat, 26 Oct 2024 06:29:37 +0200
Subject: [PATCH 03/11] Fixing logical tree

---
 Fluent.Ribbon/Controls/InRibbonGallery.cs | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/Fluent.Ribbon/Controls/InRibbonGallery.cs b/Fluent.Ribbon/Controls/InRibbonGallery.cs
index f07f74f1..a810b407 100644
--- a/Fluent.Ribbon/Controls/InRibbonGallery.cs
+++ b/Fluent.Ribbon/Controls/InRibbonGallery.cs
@@ -1013,11 +1013,10 @@ public bool IsSimplified
     #endregion
 
     /// <summary>Identifies the <see cref="ExpandButtonContent"/> dependency property.</summary>
-    public static readonly DependencyProperty ExpandButtonContentProperty = DependencyProperty.Register(
-        nameof(ExpandButtonContent), typeof(object), typeof(InRibbonGallery), new PropertyMetadata(StringBoxes.Empty));
+    public static readonly DependencyProperty ExpandButtonContentProperty = DependencyProperty.Register(nameof(ExpandButtonContent), typeof(object), typeof(InRibbonGallery), new PropertyMetadata(LogicalChildSupportHelper.OnLogicalChildPropertyChanged));
 
     /// <summary>
-    /// todo
+    /// Gets or sets the content for the expand button.
     /// </summary>
     public object? ExpandButtonContent
     {
@@ -1026,11 +1025,10 @@ public object? ExpandButtonContent
     }
 
     /// <summary>Identifies the <see cref="ExpandButtonContentTemplate"/> dependency property.</summary>
-    public static readonly DependencyProperty ExpandButtonContentTemplateProperty = DependencyProperty.Register(
-        nameof(ExpandButtonContentTemplate), typeof(DataTemplate), typeof(InRibbonGallery), new PropertyMetadata(default(DataTemplate)));
+    public static readonly DependencyProperty ExpandButtonContentTemplateProperty = DependencyProperty.Register(nameof(ExpandButtonContentTemplate), typeof(DataTemplate), typeof(InRibbonGallery), new PropertyMetadata(default(DataTemplate)));
 
     /// <summary>
-    /// todo
+    /// Gets or sets the content template for the expand button.
     /// </summary>
     public DataTemplate? ExpandButtonContentTemplate
     {

From bd5f3c3d9a18617c3367bc8eb232971b80a3b4a5 Mon Sep 17 00:00:00 2001
From: Bastian Schmidt <batzen@gmx.org>
Date: Sat, 26 Oct 2024 06:54:09 +0200
Subject: [PATCH 04/11] Fixing logical tree

---
 Fluent.Ribbon/Controls/InRibbonGallery.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Fluent.Ribbon/Controls/InRibbonGallery.cs b/Fluent.Ribbon/Controls/InRibbonGallery.cs
index a810b407..90a1484e 100644
--- a/Fluent.Ribbon/Controls/InRibbonGallery.cs
+++ b/Fluent.Ribbon/Controls/InRibbonGallery.cs
@@ -1624,6 +1624,11 @@ protected override IEnumerator LogicalChildren
             {
                 yield return this.Header;
             }
+
+            if (this.ExpandButtonContent is not null)
+            {
+                yield return this.ExpandButtonContent;
+            }
         }
     }
 

From c8fba6786cc8bf9688c1eb6f11d82bb366349986 Mon Sep 17 00:00:00 2001
From: Bastian Schmidt <batzen@gmx.org>
Date: Wed, 30 Oct 2024 08:22:28 +0100
Subject: [PATCH 05/11] Fixing MenuItem styles

---
 Fluent.Ribbon/Themes/Common.xaml            |  2 +
 Fluent.Ribbon/Themes/Controls/MenuItem.xaml | 48 +++++++++++++++------
 2 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/Fluent.Ribbon/Themes/Common.xaml b/Fluent.Ribbon/Themes/Common.xaml
index ee2b5ee4..8dfb50a8 100644
--- a/Fluent.Ribbon/Themes/Common.xaml
+++ b/Fluent.Ribbon/Themes/Common.xaml
@@ -14,6 +14,8 @@
 
     <Thickness x:Key="Fluent.Ribbon.Values.RibbonTabItem.Active.BorderThickness">0 0 0 2</Thickness>
 
+    <GridLength x:Key="Fluent.Ribbon.Values.MenuItem.IconColumnWidth">25</GridLength>
+
     <PathGeometry x:Key="Fluent.Ribbon.Values.Arrow.Left">M 0 0 L -5 5 L 0 10</PathGeometry>
     <PathGeometry x:Key="Fluent.Ribbon.Values.Arrow.Up">M 0 0 L -5 -5 L -10 0</PathGeometry>
     <PathGeometry x:Key="Fluent.Ribbon.Values.Arrow.Right">M 0 0 L 5 -5 L -0 -10</PathGeometry>
diff --git a/Fluent.Ribbon/Themes/Controls/MenuItem.xaml b/Fluent.Ribbon/Themes/Controls/MenuItem.xaml
index 1d97cf81..1631bf43 100644
--- a/Fluent.Ribbon/Themes/Controls/MenuItem.xaml
+++ b/Fluent.Ribbon/Themes/Controls/MenuItem.xaml
@@ -10,7 +10,7 @@
                      TargetType="{x:Type MenuItem}">
         <Grid Background="{TemplateBinding Background}">
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="25" />
+                <ColumnDefinition Width="{DynamicResource Fluent.Ribbon.Values.MenuItem.IconColumnWidth}" />
                 <ColumnDefinition Width="*" />
                 <ColumnDefinition Width="Auto" />
             </Grid.ColumnDefinitions>
@@ -31,6 +31,8 @@
                               RecognizesAccessKey="{Binding Path=(Fluent:MenuItem.RecognizesAccessKey), RelativeSource={RelativeSource TemplatedParent}}"
                               d:LayoutOverrides="Width" />
             <Border x:Name="iconImageBorder"
+                    Grid.Column="0"
+                    Grid.Row="0"
                     BorderThickness="1">
                 <Fluent:IconPresenter x:Name="iconImage"
                                       Margin="3 2 2 2"
@@ -41,6 +43,8 @@
                                       IconSize="{Binding Path=(Fluent:RibbonProperties.IconSize), RelativeSource={RelativeSource TemplatedParent}}" />
             </Border>
             <Image x:Name="checkedImage"
+                   Grid.Column="0"
+                   Grid.Row="0"
                    Width="16"
                    Height="16"
                    HorizontalAlignment="Center"
@@ -98,7 +102,7 @@
                      TargetType="{x:Type MenuItem}">
         <Grid Background="{TemplateBinding Background}">
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="25" />
+                <ColumnDefinition Width="{DynamicResource Fluent.Ribbon.Values.MenuItem.IconColumnWidth}" />
                 <ColumnDefinition Width="*" />
                 <ColumnDefinition Width="Auto" />
             </Grid.ColumnDefinitions>
@@ -119,6 +123,8 @@
                               RecognizesAccessKey="{Binding Path=(Fluent:MenuItem.RecognizesAccessKey), RelativeSource={RelativeSource TemplatedParent}}"
                               d:LayoutOverrides="Width" />
             <Border x:Name="iconImageBorder"
+                    Grid.Column="0"
+                    Grid.Row="0"
                     BorderThickness="1">
                 <Fluent:IconPresenter x:Name="iconImage"
                                       Margin="3 2 2 2"
@@ -129,6 +135,8 @@
                                       IconSize="{Binding Path=(Fluent:RibbonProperties.IconSize), RelativeSource={RelativeSource TemplatedParent}}" />
             </Border>
             <Image x:Name="checkedImage"
+                   Grid.Column="0"
+                   Grid.Row="0"
                    Width="16"
                    Height="16"
                    HorizontalAlignment="Center"
@@ -138,7 +146,8 @@
                    Stretch="Uniform"
                    Visibility="Collapsed" />
             <Path x:Name="path"
-                  Grid.Column="3"
+                  Grid.Column="2"
+                  Grid.Row="0"
                   Width="4"
                   Height="7"
                   Margin="1 0 9 0"
@@ -148,6 +157,8 @@
                   Stretch="Fill"
                   Stroke="{x:Null}" />
             <Popup x:Name="PART_Popup"
+                   Grid.Column="0"
+                   Grid.Row="0"
                    Grid.ColumnSpan="2"
                    Margin="0 0 -4 0"
                    VerticalAlignment="Top"
@@ -210,7 +221,7 @@
                      TargetType="{x:Type MenuItem}">
         <Grid Background="{TemplateBinding Background}">
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="25" />
+                <ColumnDefinition Width="{DynamicResource Fluent.Ribbon.Values.MenuItem.IconColumnWidth}" />
                 <ColumnDefinition Width="*" />
                 <ColumnDefinition Width="Auto" />
             </Grid.ColumnDefinitions>
@@ -253,6 +264,8 @@
                               RecognizesAccessKey="{Binding Path=(Fluent:MenuItem.RecognizesAccessKey), RelativeSource={RelativeSource TemplatedParent}}"
                               d:LayoutOverrides="Width" />
             <Border x:Name="iconImageBorder"
+                    Grid.Column="0"
+                    Grid.Row="0"
                     BorderThickness="1">
                 <Fluent:IconPresenter x:Name="iconImage"
                                       Margin="3 2 2 2"
@@ -263,6 +276,8 @@
                                       IconSize="{Binding Path=(Fluent:RibbonProperties.IconSize), RelativeSource={RelativeSource TemplatedParent}}" />
             </Border>
             <Image x:Name="checkedImage"
+                   Grid.Column="0"
+                   Grid.Row="0"
                    Width="16"
                    Height="16"
                    HorizontalAlignment="Center"
@@ -272,7 +287,8 @@
                    Stretch="Uniform"
                    Visibility="Collapsed" />
             <Path x:Name="path"
-                  Grid.Column="3"
+                  Grid.Column="2"
+                  Grid.Row="0"
                   Width="4"
                   Height="7"
                   Margin="1 0 9 0"
@@ -282,6 +298,8 @@
                   Stretch="Fill"
                   Stroke="{x:Null}" />
             <Popup x:Name="PART_Popup"
+                   Grid.Column="0"
+                   Grid.Row="0"
                    Grid.ColumnSpan="2"
                    Margin="0 0 -4 0"
                    VerticalAlignment="Top"
@@ -344,15 +362,15 @@
     <ControlTemplate x:Key="Fluent.Ribbon.Templates.MenuItemWithDescription"
                      TargetType="{x:Type Fluent:MenuItem}">
         <Grid Background="{TemplateBinding Background}">
-            <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="*" />
-            </Grid.RowDefinitions>
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="45" />
+                <ColumnDefinition Width="{DynamicResource Fluent.Ribbon.Values.MenuItem.IconColumnWidth}" />
                 <ColumnDefinition Width="*" />
                 <ColumnDefinition Width="Auto" />
             </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="*" />
+            </Grid.RowDefinitions>
             <Border x:Name="border"
                     Grid.RowSpan="2"
                     Grid.Column="0"
@@ -365,7 +383,8 @@
                     Visibility="Collapsed" />
             <ContentControl x:Name="textBlock"
                             Grid.Column="1"
-                            Margin="0 3 3 3"
+                            Grid.Row="0"
+                            Margin="5 3 3 3"
                             VerticalAlignment="Center"
                             Content="{TemplateBinding Header}"
                             ContentTemplate="{TemplateBinding HeaderTemplate}"
@@ -375,12 +394,14 @@
             <ContentPresenter x:Name="descriptionPresenter"
                               Grid.Row="1"
                               Grid.Column="1"
-                              Margin="0 3 3 3"
+                              Margin="5 3 3 3"
                               VerticalAlignment="Center"
                               ContentSource="Description"
                               RecognizesAccessKey="{Binding Path=(Fluent:MenuItem.RecognizesAccessKey), RelativeSource={RelativeSource TemplatedParent}}"
                               d:LayoutOverrides="Width" />
             <Border x:Name="iconImageBorder"
+                    Grid.Column="0"
+                    Grid.Row="0"
                     BorderThickness="1">
                 <Fluent:IconPresenter x:Name="iconImage"
                                       Margin="3 2 2 2"
@@ -391,6 +412,8 @@
                                       IconSize="{Binding Path=(Fluent:RibbonProperties.IconSize), RelativeSource={RelativeSource TemplatedParent}}" />
             </Border>
             <Image x:Name="checkedImage"
+                   Grid.Column="0"
+                   Grid.Row="0"
                    Width="16"
                    Height="16"
                    HorizontalAlignment="Center"
@@ -401,6 +424,7 @@
                    Visibility="Collapsed" />
             <TextBlock x:Name="gestureTextBlock"
                        Grid.Column="2"
+                       Grid.Row="0"
                        Margin="3 3 15 3"
                        VerticalAlignment="Center"
                        Text="{TemplateBinding InputGestureText}" />

From 3bb559e467a4b610a260d29cfced47d97ed8e0c4 Mon Sep 17 00:00:00 2001
From: Bastian Schmidt <batzen@gmx.org>
Date: Tue, 5 Nov 2024 19:37:14 +0100
Subject: [PATCH 06/11] Making control more customizable #1217

---
 .../Themes/Controls/ResizeableContentControl.xaml      | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/Fluent.Ribbon/Themes/Controls/ResizeableContentControl.xaml b/Fluent.Ribbon/Themes/Controls/ResizeableContentControl.xaml
index e25e4f25..e2c8f166 100644
--- a/Fluent.Ribbon/Themes/Controls/ResizeableContentControl.xaml
+++ b/Fluent.Ribbon/Themes/Controls/ResizeableContentControl.xaml
@@ -6,6 +6,9 @@
                     mc:Ignorable="d">
     <Style x:Key="Fluent.Ribbon.Styles.ResizeableContentControl"
            TargetType="{x:Type Fluent:ResizeableContentControl}">
+        <Setter Property="Background" Value="{DynamicResource Fluent.Ribbon.Brushes.DropDown.Background}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource Fluent.Ribbon.Brushes.DropDown.Border}" />
+        <Setter Property="BorderThickness" Value="1" />
         <Setter Property="Template" Value="{DynamicResource Fluent.Ribbon.Templates.ResizeableContentControl}" />
     </Style>
 
@@ -14,9 +17,10 @@
         <Border x:Name="PART_DropDownBorder"
                 HorizontalAlignment="Stretch"
                 VerticalAlignment="Stretch"
-                Background="{DynamicResource Fluent.Ribbon.Brushes.DropDown.Background}"
-                BorderBrush="{DynamicResource Fluent.Ribbon.Brushes.DropDown.Border}"
-                BorderThickness="1"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                Margin="{TemplateBinding Padding}"
                 SnapsToDevicePixels="True">
 
             <Grid Margin="1"

From adf0c9d48e7bdaa8029f45ce225261140aab413d Mon Sep 17 00:00:00 2001
From: Bastian Schmidt <batzen@gmx.org>
Date: Thu, 7 Nov 2024 15:32:46 +0100
Subject: [PATCH 07/11] Formatting XAML

---
 Fluent.Ribbon.Showcase/TestContent.xaml       | 38 ++++++++++---------
 .../Themes/Controls/InRibbonGallery.xaml      | 12 +++---
 Fluent.Ribbon/Themes/Controls/MenuItem.xaml   | 28 +++++++-------
 .../Controls/ResizeableContentControl.xaml    |  2 +-
 .../Themes/Controls/RibbonScrollViewer.xaml   |  4 +-
 .../Themes/Themes/Theme.Template.xaml         |  4 +-
 6 files changed, 46 insertions(+), 42 deletions(-)

diff --git a/Fluent.Ribbon.Showcase/TestContent.xaml b/Fluent.Ribbon.Showcase/TestContent.xaml
index bd375ef4..61f9f664 100644
--- a/Fluent.Ribbon.Showcase/TestContent.xaml
+++ b/Fluent.Ribbon.Showcase/TestContent.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="FluentTest.TestContent"
+<UserControl x:Class="FluentTest.TestContent"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:Fluent="urn:fluent-ribbon"
@@ -2180,6 +2180,7 @@
                     <!-- InRibbonGallery -->
                     <Fluent:InRibbonGallery Header="InRibbonGallery"
                                             Icon="Images\Gray.png"
+                                            ExpandButtonContent="{Binding DataItems.Count}"
                                             ItemHeight="56"
                                             ItemTemplate="{DynamicResource largeDataItemTemplate}"
                                             ItemWidth="40"
@@ -2190,11 +2191,12 @@
                                             MinItemsInRow="3"
                                             ResizeMode="Both"
                                             Selectable="False"
-                                            ToolTip="Items are not selectable here."
-                                            ExpandButtonContent="{Binding DataItems.Count}">
+                                            ToolTip="Items are not selectable here.">
                         <Fluent:InRibbonGallery.ExpandButtonContentTemplate>
                             <DataTemplate>
-                                <ContentControl HorizontalAlignment="Center" VerticalAlignment="Center" Content="{Binding .}" />
+                                <ContentControl HorizontalAlignment="Center"
+                                                VerticalAlignment="Center"
+                                                Content="{Binding .}" />
                             </DataTemplate>
                         </Fluent:InRibbonGallery.ExpandButtonContentTemplate>
                         <!-- You can also add items to context menu -->
@@ -3162,15 +3164,17 @@
                                                          SelectedItem="{Binding Source={x:Static controlzEx:ThemeManager.Current}, Path=ThemeSyncMode}" />
                                         <Fluent:CheckBox Header="Use HSL color"
                                                          IsChecked="{Binding Path=Options.UseHSL, Source={x:Static controlzEx:RuntimeThemeGenerator.Current}, Mode=TwoWay}" />
-                                        <Fluent:Button Header="Sync now" Size="Middle" Click="SyncThemeNow_OnClick" />
+                                        <Fluent:Button Header="Sync now"
+                                                       Click="SyncThemeNow_OnClick"
+                                                       Size="Middle" />
                                     </WrapPanel>
                                 </GroupBox>
 
                                 <GroupBox Header="WindowChrome">
                                     <WrapPanel>
                                         <Fluent:ComboBox Header="CornerPreference"
-                                                         IsEditable="False"
                                                          VerticalAlignment="Center"
+                                                         IsEditable="False"
                                                          ItemsSource="{Binding Source={StaticResource CornerPreferenceEnumValues}}"
                                                          SelectedItem="{Binding RelativeSource={RelativeSource AncestorType=controlzEx:WindowChromeWindow}, Path=CornerPreference, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
                                     </WrapPanel>
@@ -3241,20 +3245,20 @@
                                                         VerticalAlignment="Center"
                                                         Text="{Binding RelativeSource={RelativeSource AncestorType=controlzEx:WindowChromeWindow}, Path=GlowDepth, Mode=TwoWay}" />
 
-                                        <Fluent:CheckBox VerticalAlignment="Center"
-                                                         Header="IsGlowTransitionEnabled"
+                                        <Fluent:CheckBox Header="IsGlowTransitionEnabled"
+                                                         VerticalAlignment="Center"
                                                          IsChecked="{Binding RelativeSource={RelativeSource AncestorType=controlzEx:WindowChromeWindow}, Path=IsGlowTransitionEnabled, Mode=TwoWay}" />
 
-                                        <Fluent:CheckBox VerticalAlignment="Center"
-                                                         Header="UseRadialGradientForCorners"
+                                        <Fluent:CheckBox Header="UseRadialGradientForCorners"
+                                                         VerticalAlignment="Center"
                                                          IsChecked="{Binding RelativeSource={RelativeSource AncestorType=controlzEx:WindowChromeWindow}, Path=UseRadialGradientForCorners, Mode=TwoWay}" />
 
-                                        <Fluent:CheckBox VerticalAlignment="Center"
-                                                         Header="PreferDWMBorderColor"
+                                        <Fluent:CheckBox Header="PreferDWMBorderColor"
+                                                         VerticalAlignment="Center"
                                                          IsChecked="{Binding RelativeSource={RelativeSource AncestorType=controlzEx:WindowChromeWindow}, Path=PreferDWMBorderColor, Mode=TwoWay}" />
 
-                                        <Fluent:CheckBox VerticalAlignment="Center"
-                                                         Header="DWMSupportsBorderColor"
+                                        <Fluent:CheckBox Header="DWMSupportsBorderColor"
+                                                         VerticalAlignment="Center"
                                                          IsChecked="{Binding RelativeSource={RelativeSource AncestorType=controlzEx:WindowChromeWindow}, Path=DWMSupportsBorderColor, Mode=OneWay}"
                                                          IsEnabled="False" />
                                     </WrapPanel>
@@ -3326,8 +3330,8 @@
                                         </Fluent:CheckBox>
 
                                         <Fluent:ComboBox Header="BackdropType"
-                                                         IsEditable="False"
                                                          VerticalAlignment="Center"
+                                                         IsEditable="False"
                                                          ItemsSource="{Binding Source={StaticResource WindowBackdropTypeEnumValues}}"
                                                          SelectedItem="{Binding Path=(controlzEx:WindowBackdropManager.BackdropType), Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, RelativeSource={RelativeSource AncestorType={x:Type Window}}}" />
                                     </WrapPanel>
@@ -3399,8 +3403,8 @@
                                 </GroupBox>
 
                                 <GroupBox Header="Commands">
-                                    <Fluent:Button Click="HandleResetSavedState_OnClick"
-                                                   Header="Reset saved state &amp; restart"
+                                    <Fluent:Button Header="Reset saved state &amp; restart"
+                                                   Click="HandleResetSavedState_OnClick"
                                                    Size="Middle" />
                                 </GroupBox>
                             </StackPanel>
diff --git a/Fluent.Ribbon/Themes/Controls/InRibbonGallery.xaml b/Fluent.Ribbon/Themes/Controls/InRibbonGallery.xaml
index 315154f0..4e07286e 100644
--- a/Fluent.Ribbon/Themes/Controls/InRibbonGallery.xaml
+++ b/Fluent.Ribbon/Themes/Controls/InRibbonGallery.xaml
@@ -460,6 +460,7 @@
                     </ScrollViewer>
 
                     <Fluent:ToggleButton x:Name="PART_ExpandButton"
+                                         Header="{TemplateBinding ExpandButtonContent}"
                                          Style="{DynamicResource Fluent.Ribbon.Styles.InRibbonGalleryButton}"
                                          Width="17"
                                          Height="17"
@@ -469,10 +470,9 @@
                                          BorderThickness="1 1 0 0"
                                          CanAddToQuickAccessToolBar="False"
                                          ClickMode="Press"
+                                         HeaderTemplate="{TemplateBinding ExpandButtonContentTemplate}"
                                          IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
-                                         IsDefinitive="False"
-                                         Header="{TemplateBinding ExpandButtonContent}"
-                                         HeaderTemplate="{TemplateBinding ExpandButtonContentTemplate}" />
+                                         IsDefinitive="False" />
 
                     <Popup x:Name="PART_Popup"
                            Grid.ColumnSpan="2"
@@ -595,9 +595,6 @@
 
     <Style x:Key="Fluent.Ribbon.Styles.InRibbonGallery"
            TargetType="{x:Type Fluent:InRibbonGallery}">
-        <Setter Property="Focusable" Value="False" />
-        <Setter Property="Margin" Value="{DynamicResource Fluent.Ribbon.Values.Default.Margin}" />
-        <Setter Property="Template" Value="{DynamicResource Fluent.Ribbon.Templates.InRibbonGallery}" />
         <Setter Property="ExpandButtonContentTemplate">
             <Setter.Value>
                 <DataTemplate>
@@ -620,6 +617,9 @@
                 </DataTemplate>
             </Setter.Value>
         </Setter>
+        <Setter Property="Focusable" Value="False" />
+        <Setter Property="Margin" Value="{DynamicResource Fluent.Ribbon.Values.Default.Margin}" />
+        <Setter Property="Template" Value="{DynamicResource Fluent.Ribbon.Templates.InRibbonGallery}" />
         <Style.Triggers>
             <Trigger Property="Size" Value="Large">
                 <Setter Property="Height" Value="68" />
diff --git a/Fluent.Ribbon/Themes/Controls/MenuItem.xaml b/Fluent.Ribbon/Themes/Controls/MenuItem.xaml
index 1631bf43..1fd36938 100644
--- a/Fluent.Ribbon/Themes/Controls/MenuItem.xaml
+++ b/Fluent.Ribbon/Themes/Controls/MenuItem.xaml
@@ -31,8 +31,8 @@
                               RecognizesAccessKey="{Binding Path=(Fluent:MenuItem.RecognizesAccessKey), RelativeSource={RelativeSource TemplatedParent}}"
                               d:LayoutOverrides="Width" />
             <Border x:Name="iconImageBorder"
-                    Grid.Column="0"
                     Grid.Row="0"
+                    Grid.Column="0"
                     BorderThickness="1">
                 <Fluent:IconPresenter x:Name="iconImage"
                                       Margin="3 2 2 2"
@@ -43,8 +43,8 @@
                                       IconSize="{Binding Path=(Fluent:RibbonProperties.IconSize), RelativeSource={RelativeSource TemplatedParent}}" />
             </Border>
             <Image x:Name="checkedImage"
-                   Grid.Column="0"
                    Grid.Row="0"
+                   Grid.Column="0"
                    Width="16"
                    Height="16"
                    HorizontalAlignment="Center"
@@ -123,8 +123,8 @@
                               RecognizesAccessKey="{Binding Path=(Fluent:MenuItem.RecognizesAccessKey), RelativeSource={RelativeSource TemplatedParent}}"
                               d:LayoutOverrides="Width" />
             <Border x:Name="iconImageBorder"
-                    Grid.Column="0"
                     Grid.Row="0"
+                    Grid.Column="0"
                     BorderThickness="1">
                 <Fluent:IconPresenter x:Name="iconImage"
                                       Margin="3 2 2 2"
@@ -135,8 +135,8 @@
                                       IconSize="{Binding Path=(Fluent:RibbonProperties.IconSize), RelativeSource={RelativeSource TemplatedParent}}" />
             </Border>
             <Image x:Name="checkedImage"
-                   Grid.Column="0"
                    Grid.Row="0"
+                   Grid.Column="0"
                    Width="16"
                    Height="16"
                    HorizontalAlignment="Center"
@@ -146,8 +146,8 @@
                    Stretch="Uniform"
                    Visibility="Collapsed" />
             <Path x:Name="path"
-                  Grid.Column="2"
                   Grid.Row="0"
+                  Grid.Column="2"
                   Width="4"
                   Height="7"
                   Margin="1 0 9 0"
@@ -157,8 +157,8 @@
                   Stretch="Fill"
                   Stroke="{x:Null}" />
             <Popup x:Name="PART_Popup"
-                   Grid.Column="0"
                    Grid.Row="0"
+                   Grid.Column="0"
                    Grid.ColumnSpan="2"
                    Margin="0 0 -4 0"
                    VerticalAlignment="Top"
@@ -264,8 +264,8 @@
                               RecognizesAccessKey="{Binding Path=(Fluent:MenuItem.RecognizesAccessKey), RelativeSource={RelativeSource TemplatedParent}}"
                               d:LayoutOverrides="Width" />
             <Border x:Name="iconImageBorder"
-                    Grid.Column="0"
                     Grid.Row="0"
+                    Grid.Column="0"
                     BorderThickness="1">
                 <Fluent:IconPresenter x:Name="iconImage"
                                       Margin="3 2 2 2"
@@ -276,8 +276,8 @@
                                       IconSize="{Binding Path=(Fluent:RibbonProperties.IconSize), RelativeSource={RelativeSource TemplatedParent}}" />
             </Border>
             <Image x:Name="checkedImage"
-                   Grid.Column="0"
                    Grid.Row="0"
+                   Grid.Column="0"
                    Width="16"
                    Height="16"
                    HorizontalAlignment="Center"
@@ -287,8 +287,8 @@
                    Stretch="Uniform"
                    Visibility="Collapsed" />
             <Path x:Name="path"
-                  Grid.Column="2"
                   Grid.Row="0"
+                  Grid.Column="2"
                   Width="4"
                   Height="7"
                   Margin="1 0 9 0"
@@ -298,8 +298,8 @@
                   Stretch="Fill"
                   Stroke="{x:Null}" />
             <Popup x:Name="PART_Popup"
-                   Grid.Column="0"
                    Grid.Row="0"
+                   Grid.Column="0"
                    Grid.ColumnSpan="2"
                    Margin="0 0 -4 0"
                    VerticalAlignment="Top"
@@ -382,8 +382,8 @@
                     BorderThickness="1"
                     Visibility="Collapsed" />
             <ContentControl x:Name="textBlock"
-                            Grid.Column="1"
                             Grid.Row="0"
+                            Grid.Column="1"
                             Margin="5 3 3 3"
                             VerticalAlignment="Center"
                             Content="{TemplateBinding Header}"
@@ -400,8 +400,8 @@
                               RecognizesAccessKey="{Binding Path=(Fluent:MenuItem.RecognizesAccessKey), RelativeSource={RelativeSource TemplatedParent}}"
                               d:LayoutOverrides="Width" />
             <Border x:Name="iconImageBorder"
-                    Grid.Column="0"
                     Grid.Row="0"
+                    Grid.Column="0"
                     BorderThickness="1">
                 <Fluent:IconPresenter x:Name="iconImage"
                                       Margin="3 2 2 2"
@@ -412,8 +412,8 @@
                                       IconSize="{Binding Path=(Fluent:RibbonProperties.IconSize), RelativeSource={RelativeSource TemplatedParent}}" />
             </Border>
             <Image x:Name="checkedImage"
-                   Grid.Column="0"
                    Grid.Row="0"
+                   Grid.Column="0"
                    Width="16"
                    Height="16"
                    HorizontalAlignment="Center"
@@ -423,8 +423,8 @@
                    Stretch="Uniform"
                    Visibility="Collapsed" />
             <TextBlock x:Name="gestureTextBlock"
-                       Grid.Column="2"
                        Grid.Row="0"
+                       Grid.Column="2"
                        Margin="3 3 15 3"
                        VerticalAlignment="Center"
                        Text="{TemplateBinding InputGestureText}" />
diff --git a/Fluent.Ribbon/Themes/Controls/ResizeableContentControl.xaml b/Fluent.Ribbon/Themes/Controls/ResizeableContentControl.xaml
index e2c8f166..9d75ce0b 100644
--- a/Fluent.Ribbon/Themes/Controls/ResizeableContentControl.xaml
+++ b/Fluent.Ribbon/Themes/Controls/ResizeableContentControl.xaml
@@ -15,12 +15,12 @@
     <ControlTemplate x:Key="Fluent.Ribbon.Templates.ResizeableContentControl"
                      TargetType="{x:Type Fluent:ResizeableContentControl}">
         <Border x:Name="PART_DropDownBorder"
+                Margin="{TemplateBinding Padding}"
                 HorizontalAlignment="Stretch"
                 VerticalAlignment="Stretch"
                 Background="{TemplateBinding Background}"
                 BorderBrush="{TemplateBinding BorderBrush}"
                 BorderThickness="{TemplateBinding BorderThickness}"
-                Margin="{TemplateBinding Padding}"
                 SnapsToDevicePixels="True">
 
             <Grid Margin="1"
diff --git a/Fluent.Ribbon/Themes/Controls/RibbonScrollViewer.xaml b/Fluent.Ribbon/Themes/Controls/RibbonScrollViewer.xaml
index 2aad1194..42b236ae 100644
--- a/Fluent.Ribbon/Themes/Controls/RibbonScrollViewer.xaml
+++ b/Fluent.Ribbon/Themes/Controls/RibbonScrollViewer.xaml
@@ -286,10 +286,10 @@
 
     <Style x:Key="Fluent.Ribbon.Styles.ScrollViewer"
            TargetType="{x:Type ScrollViewer}">
-        <Setter Property="Focusable" Value="False" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
 
         <Setter Property="Fluent:ScrollViewerAttachedProperties.ScrollBarStyle" Value="{DynamicResource Fluent.Ribbon.Styles.ScrollBarWhite}" />
+        <Setter Property="Focusable" Value="False" />
+        <Setter Property="OverridesDefaultStyle" Value="True" />
         <Setter Property="Template" Value="{DynamicResource Fluent.Ribbon.Templates.ScrollViewer}" />
     </Style>
 
diff --git a/Fluent.Ribbon/Themes/Themes/Theme.Template.xaml b/Fluent.Ribbon/Themes/Themes/Theme.Template.xaml
index 86abfd86..c2dc0210 100644
--- a/Fluent.Ribbon/Themes/Themes/Theme.Template.xaml
+++ b/Fluent.Ribbon/Themes/Themes/Theme.Template.xaml
@@ -1,4 +1,4 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:Fluent="clr-namespace:Fluent"
                     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -179,7 +179,7 @@
 
     <!-- Gallery -->
     <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.Gallery.Header.Background" Color="{StaticResource Fluent.Ribbon.Colors.Gray3}" options:Freeze="True" />
-    
+
     <!-- InRibbonGallery -->
     <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.InRibbonGallery.Content.Background" Color="{StaticResource Fluent.Ribbon.Colors.White}" options:Freeze="True" />
 

From c98808830fee29dfb6d36349c5cd6393fec3876d Mon Sep 17 00:00:00 2001
From: Bastian Schmidt <batzen@gmx.org>
Date: Thu, 7 Nov 2024 15:32:56 +0100
Subject: [PATCH 08/11] Improving showcase

---
 Fluent.Ribbon.Showcase/MinimalWindowSample.xaml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Fluent.Ribbon.Showcase/MinimalWindowSample.xaml b/Fluent.Ribbon.Showcase/MinimalWindowSample.xaml
index df19a01d..0f0e9312 100644
--- a/Fluent.Ribbon.Showcase/MinimalWindowSample.xaml
+++ b/Fluent.Ribbon.Showcase/MinimalWindowSample.xaml
@@ -27,6 +27,12 @@
                                         Target="{Binding ElementName=button}" />
         </fluent:Ribbon.QuickAccessItems>
 
+        <fluent:Ribbon.Menu>
+            <fluent:Backstage Header="Project">
+                <fluent:BackstageTabControl />
+            </fluent:Backstage>
+        </fluent:Ribbon.Menu>
+
         <fluent:Ribbon.ContextualGroups>
             <fluent:RibbonContextualTabGroup x:Name="contextGroup1"
                                              Header="Generic context"

From 2482b11cf51e31a5285ccfc9d8fd038413320e98 Mon Sep 17 00:00:00 2001
From: Bastian Schmidt <batzen@gmx.org>
Date: Thu, 7 Nov 2024 15:34:55 +0100
Subject: [PATCH 09/11] Updating resource keys

---
 .build/ResourceKeys.cs              | 1 +
 ReferenceData/vNextResourceKeys.txt | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/.build/ResourceKeys.cs b/.build/ResourceKeys.cs
index e9c58987..7f5265bc 100644
--- a/.build/ResourceKeys.cs
+++ b/.build/ResourceKeys.cs
@@ -114,6 +114,7 @@ static string GetPrefixPart(XName name) =>
             "Color" => "Colors",
             "SolidColorBrush" => "Brushes",
             "LinearGradientBrush" => "Brushes",
+            "GridLength" => "Values",
             "Thickness" => "Values",
             "String" => "Values",
             "Boolean" => "Values",
diff --git a/ReferenceData/vNextResourceKeys.txt b/ReferenceData/vNextResourceKeys.txt
index 76b3ebdd..da6c2fba 100644
--- a/ReferenceData/vNextResourceKeys.txt
+++ b/ReferenceData/vNextResourceKeys.txt
@@ -74,6 +74,7 @@ Fluent.Ribbon.Brushes.Images.QuickAccessToolbarDropDown.BelowRibbon
 Fluent.Ribbon.Brushes.Images.QuickAccessToolbarExtender
 Fluent.Ribbon.Brushes.Images.QuickAccessToolbarExtender.BelowRibbon
 Fluent.Ribbon.Brushes.Images.RibbonDisplayOptions
+Fluent.Ribbon.Brushes.InRibbonGallery.Content.Background
 Fluent.Ribbon.Brushes.KeyTip.Background
 Fluent.Ribbon.Brushes.KeyTip.Border
 Fluent.Ribbon.Brushes.LabelText
@@ -408,6 +409,7 @@ Fluent.Ribbon.Values.Arrow.Right
 Fluent.Ribbon.Values.Arrow.Up
 Fluent.Ribbon.Values.Default.Margin
 Fluent.Ribbon.Values.Default.Padding
+Fluent.Ribbon.Values.MenuItem.IconColumnWidth
 Fluent.Ribbon.Values.RibbonTabControl.Content.BorderThickness
 Fluent.Ribbon.Values.RibbonTabControl.Content.CornerRadius
 Fluent.Ribbon.Values.RibbonTabControl.Content.DropShadowEffect

From 07003c15cb157313462e8f698d1b068dcd85b8c3 Mon Sep 17 00:00:00 2001
From: Bastian Schmidt <batzen@gmx.org>
Date: Fri, 22 Nov 2024 08:19:35 +0100
Subject: [PATCH 10/11] Improving style properties

---
 Fluent.Ribbon/Themes/Controls/InRibbonGallery.xaml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Fluent.Ribbon/Themes/Controls/InRibbonGallery.xaml b/Fluent.Ribbon/Themes/Controls/InRibbonGallery.xaml
index 4e07286e..33439f19 100644
--- a/Fluent.Ribbon/Themes/Controls/InRibbonGallery.xaml
+++ b/Fluent.Ribbon/Themes/Controls/InRibbonGallery.xaml
@@ -1,4 +1,4 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:Fluent="clr-namespace:Fluent"
                     xmlns:FluentHelpers="clr-namespace:Fluent.Helpers"
@@ -432,11 +432,11 @@
               VerticalAlignment="Stretch">
             <Border x:Name="border"
                     Height="{TemplateBinding GalleryPanelContainerHeight}"
-                    Margin="0 0 0 0"
+                    Margin="{TemplateBinding Padding}"
                     HorizontalAlignment="Stretch"
                     VerticalAlignment="Stretch"
-                    BorderBrush="{DynamicResource Fluent.Ribbon.Brushes.Control.Border}"
-                    BorderThickness="1 1 1 1"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TempateBinding BorderThickness}"
                     ClipToBounds="True">
                 <Grid Background="{DynamicResource Fluent.Ribbon.Brushes.InRibbonGallery.Content.Background}">
                     <ScrollViewer x:Name="ScrollViewer"
@@ -595,6 +595,8 @@
 
     <Style x:Key="Fluent.Ribbon.Styles.InRibbonGallery"
            TargetType="{x:Type Fluent:InRibbonGallery}">
+        <Setter Property="BorderBrush" Value="{DynamicResource Fluent.Ribbon.Brushes.Control.Border}" />
+        <Setter Property="BorderThickness" Value="1" />
         <Setter Property="ExpandButtonContentTemplate">
             <Setter.Value>
                 <DataTemplate>

From 5b69e882fd6041f1d1edfc32b358999434cb36fd Mon Sep 17 00:00:00 2001
From: Bastian Schmidt <batzen@gmx.org>
Date: Fri, 22 Nov 2024 08:26:51 +0100
Subject: [PATCH 11/11] Adding #1218 to changelog

---
 Changelog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Changelog.md b/Changelog.md
index 6a0a72f8..5f150bab 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -82,6 +82,7 @@
 
   - [#1162](../../issues/1162) - Maximum dropdown height is not screen aware
   - [#1196](../../issues/1196) - GroupName causes the selected ToggleButton to no longer trigger the click event
+  - [#1218](../../issues/1218) - Selected tab is lost on screen changes (thanks @cbra-caa)
   - Value of `HideContextTabs` are now properly restored when `Backstage` is closed
   - `RibbonTitleBar`
     - Fixed rendering when `HideContextTabs` is `true`