Fix #237: AppBarToggleButton is not greyed out when set to disabled.

Kinnara · Jan 5, 2021 · eebdb5c · eebdb5c
1 parent 47b84d5
commit eebdb5c
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 33 deletions.
diff --git a/ModernWpf.Controls/CommandBar/AppBarButton.cs b/ModernWpf.Controls/CommandBar/AppBarButton.cs
@@ -1,6 +1,4 @@
-using System;
-using System.ComponentModel;
-using System.Windows;
+using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
 using ModernWpf.Controls.Primitives;
@@ -361,36 +359,41 @@ private void UpdateVisualState(bool useTransitions = true)
 
         private void UpdateCommonState(bool useTransitions = true)
         {
+            if (_vsm is null)
+            {
+                return;
+            }
+
             string stateName;
 
             if (!IsEnabled)
             {
                 stateName = "Disabled";
             }
-            else if (IsPressed)
-            {
-                stateName = "Pressed";
-            }
-            else if (IsMouseOver)
-            {
-                stateName = "PointerOver";
-            }
             else
             {
-                stateName = "Normal";
-            }
+                if (IsPressed)
+                {
+                    stateName = "Pressed";
+                }
+                else if (IsMouseOver)
+                {
+                    stateName = "PointerOver";
+                }
+                else
+                {
+                    stateName = "Normal";
+                }
 
-            if (IsInOverflow)
-            {
-                stateName = "Overflow" + stateName;
+                if (IsInOverflow)
+                {
+                    stateName = "Overflow" + stateName;
+                }
             }
 
-            if (_vsm != null)
-            {
-                _vsm.CanChangeCommonState = true;
-                VisualStateManager.GoToState(this, stateName, useTransitions);
-                _vsm.CanChangeCommonState = false;
-            }
+            _vsm.CanChangeCommonState = true;
+            VisualStateManager.GoToState(this, stateName, useTransitions);
+            _vsm.CanChangeCommonState = false;
         }
 
         private void UpdateKeyboardAcceleratorTextVisibility(bool useTransitions = true)

diff --git a/ModernWpf.Controls/CommandBar/AppBarToggleButton.cs b/ModernWpf.Controls/CommandBar/AppBarToggleButton.cs
@@ -1,6 +1,4 @@
-using System;
-using System.ComponentModel;
-using System.Windows;
+using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
 using ModernWpf.Controls.Primitives;
@@ -329,10 +327,16 @@ private void UpdateVisualState(bool useTransitions = true)
 
         private void UpdateCommonState(bool useTransitions = true)
         {
+            if (_vsm is null)
+            {
+                return;
+            }
+
             string stateName;
+            bool isEnabled = IsEnabled;
             bool isChecked = IsChecked != false;
 
-            if (!IsEnabled)
+            if (!isEnabled)
             {
                 stateName = "Disabled";
             }
@@ -358,17 +362,14 @@ private void UpdateCommonState(bool useTransitions = true)
                 stateName = "Checked" + stateName;
             }
 
-            if (IsInOverflow)
+            if (isEnabled && IsInOverflow)
             {
                 stateName = "Overflow" + stateName;
             }
 
-            if (_vsm != null)
-            {
-                _vsm.CanChangeCommonState = true;
-                VisualStateManager.GoToState(this, stateName, useTransitions);
-                _vsm.CanChangeCommonState = false;
-            }
+            _vsm.CanChangeCommonState = true;
+            VisualStateManager.GoToState(this, stateName, useTransitions);
+            _vsm.CanChangeCommonState = false;
         }
 
         private void UpdateKeyboardAcceleratorTextVisibility(bool useTransitions = true)