Merge pull request #1072 from /issues/1070

#1070 Separators no longer shown in Backstage

Author: batzen

Changelog.md

@@ -26,6 +26,7 @@
 
   - [#1035](../../issues/1035) - Binding failures from within RibbonTabItem on IsMinimized & IsOpen
   - [#1041](../../issues/1041) - MenuItem CreateQuickAccessItem should create ToggleButton (thanks @andersforsgren)
+  - [#1070](../../issues/1070) - Separators no longer shown in Backstage (related to #936)
 
 - ### Enhancements/Features
 

Fluent.Ribbon.Showcase/TestContent.xaml

@@ -272,7 +272,7 @@
                                 </TabControl>
                             </Fluent:BackstageTabItem>
 
-                            <Fluent:SeparatorTabItem />
+                            <Separator />
 
                             <Fluent:Button Header="Exit"
                                            VerticalAlignment="Bottom"

Fluent.Ribbon/Controls/BackstageTabControl.cs

@@ -333,6 +333,17 @@ or SeparatorTabItem
             or Separator;
     }
 
+    /// <inheritdoc />
+    protected override void PrepareContainerForItemOverride(DependencyObject element, object item)
+    {
+        if (element.ReadLocalValue(DockPanel.DockProperty) == DependencyProperty.UnsetValue)
+        {
+            element.SetCurrentValue(DockPanel.DockProperty, Dock.Top);
+        }
+
+        base.PrepareContainerForItemOverride(element, item);
+    }
+
     /// <inheritdoc />
     protected override void OnItemsChanged(NotifyCollectionChangedEventArgs e)
     {

Fluent.Ribbon/Themes/Controls/Backstage.xaml

@@ -49,12 +49,10 @@
             </Grid>
         </Border>
         <ControlTemplate.Triggers>
-            <MultiTrigger>
-                <MultiTrigger.Conditions>
-                    <Condition Property="IsMouseOver" Value="True" />
-                </MultiTrigger.Conditions>
+            <Trigger Property="IsMouseOver"
+                     Value="True">
                 <Setter TargetName="rectangle" Property="Fill" Value="{DynamicResource Fluent.Ribbon.Brushes.HighTransparentWhite}" />
-            </MultiTrigger>
+            </Trigger>
             <Trigger Property="IsEnabled" Value="False">
                 <Setter TargetName="border2" Property="Opacity" Value="0.5" />
                 <Setter TargetName="contentPresenter" Property="Effect">

Fluent.Ribbon/Themes/Controls/BackstageTabControl.xaml

@@ -56,7 +56,6 @@
 
     <Style x:Key="Fluent.Ribbon.Styles.BackstageTabControl.Button"
            TargetType="{x:Type Fluent:Button}">
-        <Setter Property="DockPanel.Dock" Value="Top" />
         <Setter Property="Fluent:RibbonProperties.IconSize" Value="Small" />
         <Setter Property="Fluent:RibbonProperties.MouseOverBackground" Value="{DynamicResource Fluent.Ribbon.Brushes.BackstageTabItem.MouseOver.Background}" />
         <Setter Property="FocusVisualStyle" Value="{DynamicResource Fluent.Ribbon.Styles.ControlStyleEmptyFocus}" />
@@ -115,7 +114,6 @@
     <Style x:Key="Fluent.Ribbon.Styles.BackstageBackButton"
            TargetType="{x:Type Button}">
         <Setter Property="Background" Value="{DynamicResource Fluent.Ribbon.Brushes.Backstage.BackButton.Background}" />
-        <Setter Property="DockPanel.Dock" Value="Top" />
         <Setter Property="FocusVisualStyle" Value="{DynamicResource Fluent.Ribbon.Styles.ControlStyleEmptyFocus}" />
         <Setter Property="Foreground" Value="{DynamicResource Fluent.Ribbon.Brushes.Backstage.BackButton.Foreground}" />
         <Setter Property="Height" Value="48" />
@@ -125,7 +123,6 @@
 
     <Style x:Key="Fluent.Ribbon.Styles.BackstageTabControl.SeparatorTabItem"
            TargetType="{x:Type Fluent:SeparatorTabItem}">
-        <Setter Property="DockPanel.Dock" Value="Top" />
         <Setter Property="Focusable" Value="False" />
         <Setter Property="Margin" Value="25 10 20 10" />
         <Setter Property="Template">

Fluent.Ribbon/Themes/Controls/BackstageTabItem.xaml

@@ -61,7 +61,6 @@
     <Style x:Key="Fluent.Ribbon.Styles.BackstageTabItem"
            TargetType="{x:Type Fluent:BackstageTabItem}">
         <Setter Property="Background" Value="{Binding Background, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Fluent:BackstageTabControl}}}" />
-        <Setter Property="DockPanel.Dock" Value="Top" />
         <Setter Property="Fluent:RibbonProperties.IsSelectedBackground" Value="{DynamicResource Fluent.Ribbon.Brushes.BackstageTabItem.Selected.Background}" />
         <Setter Property="Fluent:RibbonProperties.MouseOverBackground" Value="{DynamicResource Fluent.Ribbon.Brushes.BackstageTabItem.MouseOver.Background}" />
         <Setter Property="FocusVisualStyle" Value="{DynamicResource Fluent.Ribbon.Styles.ControlStyleEmptyFocus}" />