feat: support ToggleButtonGroup option IsCanCancel

emako · Sep 10, 2024 · 343d1c6 · 343d1c6
1 parent fcf8936
commit 343d1c6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/Wpf.Ui.Test/MainWindow.xaml b/src/Wpf.Ui.Test/MainWindow.xaml
@@ -576,7 +576,7 @@
                         <StackPanel Margin="0,8,0,0" Orientation="Horizontal">
                             <StackPanel Orientation="Horizontal">
                                 <StackPanel.Resources>
-                                    <vio:ToggleButtonGroup x:Key="ToggleButtonGroup" />
+                                    <vio:ToggleButtonGroup x:Key="ToggleButtonGroup" IsCanCancel="True" />
                                 </StackPanel.Resources>
                                 <ToggleButton
                                     vio:ToggleButtonGroup.Group="{DynamicResource ToggleButtonGroup}"

diff --git a/src/Wpf.Ui.Violeta/Controls/Primitives/ToggleButtonGroup.cs b/src/Wpf.Ui.Violeta/Controls/Primitives/ToggleButtonGroup.cs
@@ -1,11 +1,14 @@
 using System.Collections.Generic;
+using System.Linq;
 using System.Windows;
 using System.Windows.Controls.Primitives;
 
 namespace Wpf.Ui.Violeta.Controls.Primitives;
 
 public class ToggleButtonGroup : List<ToggleButton>
 {
+    public bool IsCanCancel { get; set; } = false;
+
     public static ToggleButtonGroup GetGroup(DependencyObject obj)
     {
         return (ToggleButtonGroup)obj.GetValue(GroupProperty);
@@ -56,9 +59,9 @@ public void Join(ToggleButton toggleButton)
         };
         toggleButton.Unchecked += (s, e) =>
         {
-            if (!Handling && s is ToggleButton tb)
+            if (!IsCanCancel && !Handling && s is ToggleButton cb)
             {
-                tb.IsChecked = true;
+                cb.IsChecked = true;
             }
         };
         SetGroup(toggleButton, this);