Merge pull request #1697 from r2d2rigo/menuitem-disabled-state

MenuItem disabled state
CommunityToolkit · Jan 19, 2018 · 7387986 · 7387986
2 parents 9b92045 + df6dec3
commit 7387986
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 2 deletions.
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Menu/Menu.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Menu/Menu.bind
@@ -24,8 +24,7 @@
 
     <controls:Menu AllowTooltip="@[AllowTooltip:Bool:False]"
                    Orientation="@[Orientation:Enum:Orientation.Horizontal]"
-                   TooltipPlacement="@[TooltipPlacement:Enum:PlacementMode.Bottom]">
-
+                   TooltipPlacement="@[TooltipPlacement:Enum:PlacementMode.Bottom]">      
       <controls:MenuItem Name="FileMenu"
                          controls:Menu.InputGestureText="Alt+F"
                          Header="^File">

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.xaml b/Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.xaml
@@ -71,6 +71,25 @@
                                         <PointerUpThemeAnimation Storyboard.TargetName="FlyoutButton" />
                                     </Storyboard>
                                 </VisualState>
+                                <VisualState x:Name="Disabled">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="FlyoutButton"
+                                                                       Storyboard.TargetProperty="BorderBrush">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource SystemControlDisabledTransparentBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="FlyoutButton"
+                                                                       Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource SystemControlDisabledBaseMediumLowBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="FlyoutButton"
+                                                                       Storyboard.TargetProperty="Background">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource SystemControlBackgroundBaseLowBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
                             </VisualStateGroup>
                         </VisualStateManager.VisualStateGroups>
                     </Button>

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Menu/MenuItem.cs b/Microsoft.Toolkit.Uwp.UI.Controls/Menu/MenuItem.cs
@@ -104,6 +104,7 @@ protected override void OnApplyTemplate()
             IsOpened = false;
 
             Items.VectorChanged -= Items_VectorChanged;
+            IsEnabledChanged -= MenuItem_IsEnabledChanged;
 
             if (MenuFlyout == null)
             {
@@ -128,16 +129,26 @@ protected override void OnApplyTemplate()
                 MenuFlyout.MenuFlyoutPresenterStyle = _parentMenu.MenuFlyoutStyle;
                 ReAddItemsToFlyout();
 
+                IsEnabledChanged += MenuItem_IsEnabledChanged;
+
                 if (_isAccessKeySupported)
                 {
                     FlyoutButton.AccessKey = AccessKey;
                     AccessKey = string.Empty;
                 }
             }
 
+            UpdateEnabledVisualState();
+
             base.OnApplyTemplate();
         }
 
+        private void MenuItem_IsEnabledChanged(object sender, DependencyPropertyChangedEventArgs e)
+        {
+            var menuItemControl = (MenuItem)sender;
+            menuItemControl.UpdateEnabledVisualState();
+        }
+
         internal void CalculateBounds()
         {
             var ttv = TransformToVisual(Window.Current.Content);
@@ -500,5 +511,17 @@ internal void RemoveUnderline()
                 InternalHeader = _originalHeader.Replace(UnderlineCharacter.ToString(), string.Empty);
             }
         }
+
+        internal void UpdateEnabledVisualState()
+        {
+            if (IsEnabled)
+            {
+                VisualStateManager.GoToState(this, "Normal", true);
+            }
+            else
+            {
+                VisualStateManager.GoToState(this, "Disabled", true);
+            }
+        }
     }
 }