Fixing selection issues for ribbon tabs

fluentribbon · Mar 31, 2018 · c1220c8 · c1220c8
1 parent 95f289a
commit c1220c8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 14 deletions.
diff --git a/Fluent.Ribbon/Controls/RibbonTabItem.cs b/Fluent.Ribbon/Controls/RibbonTabItem.cs
@@ -204,13 +204,7 @@ public bool IsSelected
         /// <summary>
         /// Gets ribbon tab control parent
         /// </summary>
-        internal RibbonTabControl TabControlParent
-        {
-            get
-            {
-                return ItemsControl.ItemsControlFromItemContainer(this) as RibbonTabControl;
-            }
-        }
+        internal RibbonTabControl TabControlParent => UIHelper.GetParent<RibbonTabControl>(this);
 
         /// <summary>
         /// Gets or sets indent
@@ -756,7 +750,7 @@ protected override void OnMouseLeftButtonDown(MouseButtonEventArgs e)
                     {
                         var newItem = this.TabControlParent.ItemContainerGenerator.ItemFromContainer(this);
 
-                        if (ReferenceEquals(this.TabControlParent.SelectedTabItem, newItem))
+                        if (ReferenceEquals(this.TabControlParent.SelectedItem, newItem))
                         {
                             this.TabControlParent.IsDropDownOpen = !this.TabControlParent.IsDropDownOpen;
                         }
@@ -790,8 +784,8 @@ private static void OnIsSelectedChanged(DependencyObject d, DependencyPropertyCh
             var newValue = (bool)e.NewValue;
             if (newValue)
             {
-                if (container.TabControlParent?.SelectedItem is RibbonTabItem
-                    && ReferenceEquals(container.TabControlParent.SelectedItem, container) == false)
+                if (container.TabControlParent != null
+                    && ReferenceEquals(container.TabControlParent.SelectedTabItem, container) == false)
                 {
                     ((RibbonTabItem)container.TabControlParent.SelectedItem).IsSelected = false;
                 }

diff --git a/Fluent.Ribbon/Controls/RibbonTitleBar.cs b/Fluent.Ribbon/Controls/RibbonTitleBar.cs
@@ -9,6 +9,7 @@ namespace Fluent
     using System.Windows.Media;
     using Fluent.Extensions;
     using Fluent.Helpers;
+    using Fluent.Internal;
     using Fluent.Internal.KnownBoxes;
     using WindowChrome = ControlzEx.Windows.Shell.WindowChrome;
 
@@ -309,10 +310,7 @@ private void Update(Size constraint)
             {
                 var firstVisibleItem = visibleGroups.First().FirstVisibleItem;
 
-                if (firstVisibleItem?.Parent != null)
-                {
-                    canRibbonTabControlScroll = ((RibbonTabControl)firstVisibleItem.Parent).CanScroll;
-                }
+                canRibbonTabControlScroll = UIHelper.GetParent<RibbonTabControl>(firstVisibleItem)?.CanScroll == true;
             }
 
             if (this.IsCollapsed)