Merge pull request #1043 from andersforsgren/menuitem-createqatitem-fix

Fixes #1041 by making MenuItem create ToggleButton on QAT
fluentribbon · Jul 5, 2022 · b48b3e4 · b48b3e4
2 parents a7446aa + 3e9af72
commit b48b3e4
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/Fluent.Ribbon.Showcase/TestContent.xaml b/Fluent.Ribbon.Showcase/TestContent.xaml
@@ -1913,7 +1913,8 @@
                                         LargeIcon="{iconPacks:Material Kind=Cog}">
                         <Fluent:MenuItem Header="First (with icon)"
                                          GroupName="{Binding Converter={StaticResource UniqueGroupNameConverter}, ConverterParameter=MenuItemGroup1}"
-                                         Icon="Images/Pink.png"
+                                         Icon="Images/Pink.png"
+                                         CanAddToQuickAccessToolBar="True"
                                          IsCheckable="True"
                                          IsChecked="True" />
                         <Fluent:MenuItem Header="Second"

diff --git a/Fluent.Ribbon/Controls/MenuItem.cs b/Fluent.Ribbon/Controls/MenuItem.cs
@@ -324,10 +324,20 @@ public virtual FrameworkElement CreateQuickAccessItem()
                 }
             }
             else
-            {
-                var button = new Button();
-                RibbonControl.BindQuickAccessItem(this, button);
-                return button;
+            {
+                if (this.IsCheckable)
+                {
+                    var toggleButton = new ToggleButton();
+                    RibbonControl.Bind(this, toggleButton, nameof(this.IsChecked), System.Windows.Controls.Primitives.ToggleButton.IsCheckedProperty, BindingMode.TwoWay);
+                    RibbonControl.BindQuickAccessItem(this, toggleButton);
+                    return toggleButton;
+                }
+                else
+                {
+                    var button = new Button();
+                    RibbonControl.BindQuickAccessItem(this, button);
+                    return button;
+                }
             }
         }