ToggleButtonHelper.OnIsCheckedChanged() accepts type of "bool?".

fluentribbon · Sep 23, 2015 · 1517b45 · 1517b45
1 parent 1d0b6ba
commit 1517b45
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/Fluent/Helpers/ToggleButtonHelper.cs b/Fluent/Helpers/ToggleButtonHelper.cs
@@ -80,11 +80,11 @@ public static object CoerceIsChecked(DependencyObject d, object basevalue)
         /// </summary>
         public static void OnIsCheckedChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
-            var newValue = (bool)e.NewValue;
+            var newValue = (bool?)e.NewValue;
             var button = (IToggleButton)d;
 
             // Uncheck other toggle buttons
-            if (!newValue || button.GroupName == null)
+            if (!newValue.HasValue || !newValue.Value || button.GroupName == null)
             {
                 return;
             }

diff --git a/FluentTest/TestContent.xaml b/FluentTest/TestContent.xaml
@@ -1120,7 +1120,7 @@
                     <Fluent:ToggleButton Header="Toggle 2"
                                          GroupName="Group1" />
                     <Fluent:ToggleButton Header="Toggle 3"
-                                         GroupName="Group1" />
+                                         GroupName="Group1" IsChecked="{Binding Path=IsCheckedToggleButton3}"/>
                 </Fluent:RibbonGroupBox>
 
                 <Fluent:RibbonGroupBox>

diff --git a/FluentTest/ViewModels/MainViewModel.cs b/FluentTest/ViewModels/MainViewModel.cs
@@ -22,6 +22,7 @@ public class MainViewModel : ViewModel
 		private double zoom;
 		private ICommand testCommand;
         private string[] manyItems;
+        private bool? isCheckedToggleButton3;
 
         public MainViewModel()
         {
@@ -133,6 +134,19 @@ public string[] ManyItems
             get { return this.manyItems ?? (this.manyItems = this.GenerateStrings(5000)); }
         }
 
+        public bool? IsCheckedToggleButton3
+        {
+            get { return this.isCheckedToggleButton3; }
+            set
+            {
+                if (this.isCheckedToggleButton3 != value)
+                {
+                    this.isCheckedToggleButton3 = value;
+                    this.OnPropertyChanged("ToggleButton3IsChecked");
+                }
+            }
+        }
+
         private string[] GenerateStrings(int count)
         {
             return Enumerable.Repeat("Test", count).ToArray();