Fixes #1185

Author: batzen

Changelog.md

@@ -7,6 +7,7 @@
   - Simplified state was not updated when items changed
   - [#1165](../../issues/1165) - ScreenTip is not DPI aware
   - [#1183](../../issues/1183) - MenuItems, having a submenu, do not stay highlighted when MenuItem from the submenu is highlighted
+  - [#1185](../../issues/1185) - LauncherIcon not rendered correctly and items in QAT can be removed from QAT in it's popup
   - [#1191](../../issues/1191) - Popup of DropDownButton/SplitButton has unwanted MinHeight
 
 - ### Enhancements/Features

Fluent.Ribbon/Controls/Ribbon.cs

@@ -21,7 +21,6 @@ namespace Fluent;
 using Fluent.Helpers;
 using Fluent.Internal.KnownBoxes;
 using Fluent.Localization;
-using WindowChrome = ControlzEx.WindowChrome;
 
 // TODO: improve style parts naming & using
 
@@ -42,7 +41,7 @@ public class Ribbon : Control, ILogicalChildSupport
     /// <summary>
     /// Gets the current instance for storing the state of this control.
     /// </summary>
-    public IRibbonStateStorage RibbonStateStorage => this.ribbonStateStorage ?? (this.ribbonStateStorage = this.CreateRibbonStateStorage());
+    public IRibbonStateStorage RibbonStateStorage => this.ribbonStateStorage ??= this.CreateRibbonStateStorage();
 
     /// <summary>
     /// Create a new instance for storing the state of this control.
@@ -446,38 +445,43 @@ private static void OnContextMenuOpened(object sender, RoutedEventArgs e)
                 //Debug.WriteLine("Menu opened on "+control);
                 if (control is not null)
                 {
-                    FirstSeparator.Visibility = Visibility.Visible;
-
                     // Check for value because remove is only possible in the context menu of items in QA which represent the value for QA-items
-                    if (ribbon.QuickAccessElements.ContainsValue(control))
+                    if (ribbon.QuickAccessElements.ContainsValue(control)
+                        && (control is not IDropDownControl dropDownControl || dropDownControl.IsDropDownOpen is false))
                     {
+                        FirstSeparator.Visibility = Visibility.Visible;
+
                         // Control is on quick access
                         RemoveFromQuickAccessMenuItem.Visibility = Visibility.Visible;
                     }
-                    else if (control is System.Windows.Controls.MenuItem)
-                    {
-                        // Control is menu item
-                        AddMenuToQuickAccessMenuItem.Visibility = Visibility.Visible;
-                    }
-                    else if (control is Gallery ||
-                             control is InRibbonGallery)
-                    {
-                        // Control is gallery
-                        AddGalleryToQuickAccessMenuItem.Visibility = Visibility.Visible;
-                    }
-                    else if (control is RibbonGroupBox)
-                    {
-                        // Control is group box
-                        AddGroupToQuickAccessMenuItem.Visibility = Visibility.Visible;
-                    }
-                    else if (control is IQuickAccessItemProvider)
-                    {
-                        // Its other control
-                        AddToQuickAccessMenuItem.Visibility = Visibility.Visible;
-                    }
                     else
                     {
-                        FirstSeparator.Visibility = Visibility.Collapsed;
+                        FirstSeparator.Visibility = Visibility.Visible;
+
+                        if (control is System.Windows.Controls.MenuItem)
+                        {
+                            // Control is menu item
+                            AddMenuToQuickAccessMenuItem.Visibility = Visibility.Visible;
+                        }
+                        else if (control is Gallery or InRibbonGallery)
+                        {
+                            // Control is gallery
+                            AddGalleryToQuickAccessMenuItem.Visibility = Visibility.Visible;
+                        }
+                        else if (control is RibbonGroupBox)
+                        {
+                            // Control is group box
+                            AddGroupToQuickAccessMenuItem.Visibility = Visibility.Visible;
+                        }
+                        else if (control is IQuickAccessItemProvider)
+                        {
+                            // Its other control
+                            AddToQuickAccessMenuItem.Visibility = Visibility.Visible;
+                        }
+                        else
+                        {
+                            FirstSeparator.Visibility = Visibility.Collapsed;
+                        }
                     }
                 }
             }
@@ -1507,16 +1511,17 @@ private static void OnAddToQuickAccessCommandCanExecute(object sender, CanExecut
     {
         if (sender is Ribbon ribbon
             && ribbon.IsQuickAccessToolBarVisible
-            && QuickAccessItemsProvider.IsSupported(e.Parameter as UIElement)
-            && ribbon.IsInQuickAccessToolBar(e.Parameter as UIElement) == false)
+            && e.Parameter is UIElement element
+            && QuickAccessItemsProvider.IsSupported(element)
+            && ribbon.IsInQuickAccessToolBar(element) is false)
         {
             if (e.Parameter is Gallery gallery)
             {
                 e.CanExecute = ribbon.IsInQuickAccessToolBar(FindParentRibbonControl(gallery) as UIElement) == false;
             }
             else
             {
-                e.CanExecute = ribbon.IsInQuickAccessToolBar(e.Parameter as UIElement) == false;
+                e.CanExecute = ribbon.IsInQuickAccessToolBar(element) == false;
             }
         }
         else

Fluent.Ribbon/Controls/RibbonGroupBox.cs

@@ -749,6 +749,12 @@ private void OnUnloaded(object sender, RoutedEventArgs e)
     {
         this.SetCurrentValue(IsDropDownOpenProperty, false);
 
+        if (this.IsDropDownOpen
+            && this.State is RibbonGroupBoxState.QuickAccess)
+        {
+            this.OnPopupClosed(this, EventArgs.Empty);
+        }
+
         this.UnSubscribeEvents();
     }
 
@@ -1187,7 +1193,6 @@ public virtual FrameworkElement CreateQuickAccessItem()
         RibbonControl.Bind(this, groupBox, nameof(this.LauncherCommandParameter), LauncherCommandParameterProperty, BindingMode.OneWay);
         RibbonControl.Bind(this, groupBox, nameof(this.LauncherCommand), LauncherCommandProperty, BindingMode.OneWay);
         RibbonControl.Bind(this, groupBox, nameof(this.LauncherCommandTarget), LauncherCommandTargetProperty, BindingMode.OneWay);
-        RibbonControl.Bind(this, groupBox, nameof(this.LauncherIcon), LauncherIconProperty, BindingMode.OneWay);
         RibbonControl.Bind(this, groupBox, nameof(this.LauncherText), LauncherTextProperty, BindingMode.OneWay);
         RibbonControl.Bind(this, groupBox, nameof(this.LauncherToolTip), LauncherToolTipProperty, BindingMode.OneWay);
         RibbonControl.Bind(this, groupBox, nameof(this.IsLauncherEnabled), IsLauncherEnabledProperty, BindingMode.OneWay);
@@ -1213,6 +1218,24 @@ public virtual FrameworkElement CreateQuickAccessItem()
             }
         }
 
+        if (this.LauncherIcon is not null)
+        {
+            if (this.LauncherIcon is Visual iconVisual)
+            {
+                var rect = new Rectangle
+                {
+                    Width = 16,
+                    Height = 16,
+                    Fill = new VisualBrush(iconVisual)
+                };
+                groupBox.LauncherIcon = rect;
+            }
+            else
+            {
+                RibbonControl.Bind(this, groupBox, nameof(this.LauncherIcon), RibbonGroupBox.LauncherIconProperty, BindingMode.OneWay);
+            }
+        }
+
         return groupBox;
     }