Fixes #840 by fixing logical tree issues

fluentribbon · Aug 15, 2020 · 829c498 · 829c498
1 parent 71d2e00
commit 829c498
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 20 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -7,6 +7,7 @@
   - [#821](../../issues/821) - Different visual of menu item and submenu item
   - [#830](../../issues/830) - When a window is set to automatically resize to its content, when its title is set in code, it disappears
   - [#834](../../issues/834) - InRibbonGallery resizing issue when changing `Visibility`
+  - [#840](../../issues/840) - Ribbon does not scroll anymore
 
 ## 8.0.0
 

diff --git a/Fluent.Ribbon/Controls/Ribbon.cs b/Fluent.Ribbon/Controls/Ribbon.cs
@@ -491,10 +491,10 @@ private static void OnContextMenuOpened(object sender, RoutedEventArgs e)
         private ObservableCollection<Key> keyTipKeys;
 
         // Collection of contextual tab groups
-        private ItemCollectionWithLogicalTreeSupport<RibbonContextualTabGroup> contextualGroups;
+        private ObservableCollection<RibbonContextualTabGroup> contextualGroups;
 
         // Collection of tabs
-        private ItemCollectionWithLogicalTreeSupport<RibbonTabItem> tabs;
+        private ObservableCollection<RibbonTabItem> tabs;
 
         // Collection of toolbar items
         private ObservableCollection<UIElement> toolBarItems;
@@ -824,13 +824,13 @@ public double QuickAccessToolBarHeight
         /// Gets collection of contextual tab groups
         /// </summary>
         [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
-        public ItemCollectionWithLogicalTreeSupport<RibbonContextualTabGroup> ContextualGroups
+        public ObservableCollection<RibbonContextualTabGroup> ContextualGroups
         {
             get
             {
                 if (this.contextualGroups == null)
                 {
-                    this.contextualGroups = new ItemCollectionWithLogicalTreeSupport<RibbonContextualTabGroup>(this);
+                    this.contextualGroups = new ObservableCollection<RibbonContextualTabGroup>();
                 }
 
                 return this.contextualGroups;
@@ -841,13 +841,13 @@ public ItemCollectionWithLogicalTreeSupport<RibbonContextualTabGroup> Contextual
         /// gets collection of ribbon tabs
         /// </summary>
         [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
-        public ItemCollectionWithLogicalTreeSupport<RibbonTabItem> Tabs
+        public ObservableCollection<RibbonTabItem> Tabs
         {
             get
             {
                 if (this.tabs == null)
                 {
-                    this.tabs = new ItemCollectionWithLogicalTreeSupport<RibbonTabItem>(this);
+                    this.tabs = new ObservableCollection<RibbonTabItem>();
                 }
 
                 return this.tabs;
@@ -1906,16 +1906,6 @@ protected override IEnumerator LogicalChildren
                     yield return this.TabControl.ToolbarPanel;
                 }
 
-                foreach (var item in this.Tabs.GetLogicalChildren())
-                {
-                    yield return item;
-                }
-
-                foreach (var item in this.ContextualGroups.GetLogicalChildren())
-                {
-                    yield return item;
-                }
-
                 if (this.layoutRoot != null)
                 {
                     yield return this.layoutRoot;

diff --git a/Fluent.Ribbon/Controls/RibbonGroupsContainerScrollViewer.cs b/Fluent.Ribbon/Controls/RibbonGroupsContainerScrollViewer.cs
@@ -0,0 +1,17 @@
+// ReSharper disable once CheckNamespace
+namespace Fluent
+{
+    using System.Windows;
+    using System.Windows.Controls;
+
+    /// <summary>
+    /// Represents a <see cref="ScrollViewer"/> specific to <see cref="RibbonGroupsContainer"/>.
+    /// </summary>
+    public class RibbonGroupsContainerScrollViewer : ScrollViewer
+    {
+        static RibbonGroupsContainerScrollViewer()
+        {
+            DefaultStyleKeyProperty.OverrideMetadata(typeof(RibbonGroupsContainerScrollViewer), new FrameworkPropertyMetadata(typeof(RibbonGroupsContainerScrollViewer)));
+        }
+    }
+}
diff --git a/Fluent.Ribbon/Controls/RibbonScrollViewer.cs b/Fluent.Ribbon/Controls/RibbonScrollViewer.cs
@@ -5,7 +5,7 @@ namespace Fluent
     using System.Windows.Media;
 
     /// <summary>
-    /// Represents ScrollViewer with modified hit test
+    /// Represents <see cref="ScrollViewer"/> with modified hit test
     /// </summary>
     public class RibbonScrollViewer : ScrollViewer
     {

diff --git a/Fluent.Ribbon/Controls/RibbonTabItem.cs b/Fluent.Ribbon/Controls/RibbonTabItem.cs
@@ -108,7 +108,7 @@ public string KeyTip
         /// <summary>
         /// Gets ribbon groups container
         /// </summary>
-        public ScrollViewer GroupsContainer { get; } = new ScrollViewer { VerticalScrollBarVisibility = ScrollBarVisibility.Disabled };
+        public ScrollViewer GroupsContainer { get; } = new RibbonGroupsContainerScrollViewer { VerticalScrollBarVisibility = ScrollBarVisibility.Disabled };
 
         /// <summary>
         /// Gets or sets whether ribbon is minimized

diff --git a/Fluent.Ribbon/Themes/Common.xaml b/Fluent.Ribbon/Themes/Common.xaml
@@ -45,4 +45,6 @@
     <Style TargetType="{x:Type Fluent:RibbonTitleBar}" BasedOn="{StaticResource RibbonTitleBarStyle}" />
     <Style TargetType="{x:Type Fluent:RibbonTabControl}" BasedOn="{StaticResource RibbonTabControlStyle}" />
     <Style TargetType="{x:Type Fluent:QuickAccessToolBar}" BasedOn="{StaticResource QuickAccessToolbarStyle}" />
+
+    <Style TargetType="{x:Type Fluent:RibbonGroupsContainerScrollViewer}" BasedOn="{StaticResource Fluent.Ribbon.Styles.RibbonGroupsContainerScrollViewer}" />
 </ResourceDictionary>
diff --git a/Fluent.Ribbon/Themes/Controls/RibbonScrollViewer.xaml b/Fluent.Ribbon/Themes/Controls/RibbonScrollViewer.xaml
@@ -343,15 +343,27 @@
 
     <Style x:Key="ScrollViewerStyle"
            TargetType="{x:Type ScrollViewer}">
+        <Style.Resources>
+            <Style x:Key="{x:Type ScrollBar}"
+                   TargetType="{x:Type ScrollBar}"
+                   BasedOn="{StaticResource ScrollBarWhite}" />
+        </Style.Resources>
+
+        <Setter Property="Template"
+                Value="{DynamicResource ScrollViewerControlTemplate}" />
+
         <Style.Triggers>
             <Trigger Property="IsEnabled"
                      Value="false">
                 <Setter Property="Foreground"
                         Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
             </Trigger>
         </Style.Triggers>
-        <Setter Property="Template"
-                Value="{DynamicResource ScrollViewerControlTemplate}" />
+    </Style>
+
+    <Style x:Key="Fluent.Ribbon.Styles.RibbonGroupsContainerScrollViewer"
+           TargetType="{x:Type Fluent:RibbonGroupsContainerScrollViewer}"
+           BasedOn="{StaticResource RibbonScrollViewer}">
     </Style>
 
     <ControlTemplate x:Key="ScrollViewerControlTemplate"