diff --git a/Changelog.md b/Changelog.md index 583251f06..680e7bfdc 100644 --- a/Changelog.md +++ b/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 diff --git a/Fluent.Ribbon.Showcase/TestContent.xaml b/Fluent.Ribbon.Showcase/TestContent.xaml index eb896f44d..591041d69 100644 --- a/Fluent.Ribbon.Showcase/TestContent.xaml +++ b/Fluent.Ribbon.Showcase/TestContent.xaml @@ -272,7 +272,7 @@ - + + 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); + } + /// protected override void OnItemsChanged(NotifyCollectionChangedEventArgs e) { diff --git a/Fluent.Ribbon/Themes/Controls/Backstage.xaml b/Fluent.Ribbon/Themes/Controls/Backstage.xaml index 0826ac9a4..a7f68d2d4 100644 --- a/Fluent.Ribbon/Themes/Controls/Backstage.xaml +++ b/Fluent.Ribbon/Themes/Controls/Backstage.xaml @@ -49,12 +49,10 @@ - - - - + - + diff --git a/Fluent.Ribbon/Themes/Controls/BackstageTabControl.xaml b/Fluent.Ribbon/Themes/Controls/BackstageTabControl.xaml index cbf9c5e4b..6465bd10d 100644 --- a/Fluent.Ribbon/Themes/Controls/BackstageTabControl.xaml +++ b/Fluent.Ribbon/Themes/Controls/BackstageTabControl.xaml @@ -56,7 +56,6 @@