From 7943fba9fe6afc0bb15c92bf54ecc702808b4918 Mon Sep 17 00:00:00 2001
From: Peter <szpeter@Yeah.net>
Date: Sat, 15 Jun 2024 00:46:54 +0800
Subject: [PATCH 1/2] Fix: NumberBox Code binding

---
 WinUIGallery/ControlPages/NumberBoxPage.xaml  | 12 ++++++++---
 .../ControlPages/NumberBoxPage.xaml.cs        | 21 +++++++------------
 .../NumberBox/NumberBoxSample2_xaml.txt       |  2 +-
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/WinUIGallery/ControlPages/NumberBoxPage.xaml b/WinUIGallery/ControlPages/NumberBoxPage.xaml
index a3eeb8289..b948098aa 100644
--- a/WinUIGallery/ControlPages/NumberBoxPage.xaml
+++ b/WinUIGallery/ControlPages/NumberBoxPage.xaml
@@ -44,11 +44,17 @@
                 </NumberBox>
             </local:ControlExample.Example>
             <local:ControlExample.Options>
-                <RadioButtons x:Name="SpinButtonPlacementGroup" Header="SpinButton placement">
-                    <RadioButton Content="Inline" Tag="Inline" Checked="RadioButton_Checked" />
-                    <RadioButton Content="Compact" Tag="Compact" Checked="RadioButton_Checked" IsChecked="True" />
+                <RadioButtons x:Name="SpinButtonPlacementGroup" Header="SpinButton placement" SelectedIndex="1"  SelectionChanged="SpinButtonPlacementGroup_SelectionChanged">
+                    <!--<RadioButton Content="Inline" Tag="Inline" Checked="RadioButton_Checked" />
+                    <RadioButton Content="Compact" Tag="Compact" Checked="RadioButton_Checked" IsChecked="True" />-->
+                    <x:String>Inline</x:String>
+                    <x:String>Compact</x:String>
                 </RadioButtons>
             </local:ControlExample.Options>
+            <local:ControlExample.Substitutions>
+                <!--<local:ControlExampleSubstitution Key="SpinButtonPlacementMode" Value="{x:Bind ((RadioButton)SpinButtonPlacementGroup.SelectedItem).Content, Mode=OneWay, TargetNullValue='Compact'}"/>-->
+                <local:ControlExampleSubstitution Key="SpinButtonPlacementMode" Value="{x:Bind SpinButtonPlacementGroup.SelectedItem, Mode=OneWay}"/>
+            </local:ControlExample.Substitutions>
         </local:ControlExample>
         
         <local:ControlExample HeaderText="A formatted NumberBox that rounds to the nearest 0.25." 
diff --git a/WinUIGallery/ControlPages/NumberBoxPage.xaml.cs b/WinUIGallery/ControlPages/NumberBoxPage.xaml.cs
index 2f98e245a..5c097054c 100644
--- a/WinUIGallery/ControlPages/NumberBoxPage.xaml.cs
+++ b/WinUIGallery/ControlPages/NumberBoxPage.xaml.cs
@@ -38,21 +38,16 @@ private void SetNumberBoxNumberFormatter()
             FormattedNumberBox.NumberFormatter = formatter;
         }
 
-        private void RadioButton_Checked(object sender, RoutedEventArgs e)
+        private void SpinButtonPlacementGroup_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
-            if (sender is RadioButton rb && NumberBoxSpinButtonPlacementExample != null)
+            switch(SpinButtonPlacementGroup.SelectedItem as string)
             {
-                string spinButtonPlacementModeName = rb.Tag.ToString();
-
-                switch (spinButtonPlacementModeName)
-                {
-                    case "Inline":
-                        NumberBoxSpinButtonPlacementExample.SpinButtonPlacementMode = NumberBoxSpinButtonPlacementMode.Inline;
-                        break;
-                    case "Compact":
-                        NumberBoxSpinButtonPlacementExample.SpinButtonPlacementMode = NumberBoxSpinButtonPlacementMode.Compact;
-                        break;
-                }
+                case "Inline":
+                    NumberBoxSpinButtonPlacementExample.SpinButtonPlacementMode = NumberBoxSpinButtonPlacementMode.Inline;
+                    break;
+                case "Compact":
+                    NumberBoxSpinButtonPlacementExample.SpinButtonPlacementMode = NumberBoxSpinButtonPlacementMode.Compact;
+                    break;
             }
         }
     }
diff --git a/WinUIGallery/ControlPagesSampleCode/NumberBox/NumberBoxSample2_xaml.txt b/WinUIGallery/ControlPagesSampleCode/NumberBox/NumberBoxSample2_xaml.txt
index 302233862..efcc7e71c 100644
--- a/WinUIGallery/ControlPagesSampleCode/NumberBox/NumberBoxSample2_xaml.txt
+++ b/WinUIGallery/ControlPagesSampleCode/NumberBox/NumberBoxSample2_xaml.txt
@@ -1,6 +1,6 @@
 <NumberBox x:Name="NumberBoxSpinButtonPlacementExample"
     Header="Enter an integer:" 
     Value="1" 
-    SpinButtonPlacementMode="Compact" 
+    SpinButtonPlacementMode="$(SpinButtonPlacementMode)" 
     SmallChange="10"
     LargeChange="100" />
\ No newline at end of file

From e7a8e006897a3d7b3d26c25401ec054db6f1b278 Mon Sep 17 00:00:00 2001
From: Peter <szpeter@Yeah.net>
Date: Sat, 15 Jun 2024 01:03:06 +0800
Subject: [PATCH 2/2] Add binding for EasingFunction

---
 .../ControlPages/EasingFunctionPage.xaml      |  7 ++++---
 WinUIGallery/ControlPages/NumberBoxPage.xaml  | 11 ++++------
 .../ControlPages/NumberBoxPage.xaml.cs        | 21 ++++++++++++-------
 3 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/WinUIGallery/ControlPages/EasingFunctionPage.xaml b/WinUIGallery/ControlPages/EasingFunctionPage.xaml
index 796b790e5..a5c6dd3ce 100644
--- a/WinUIGallery/ControlPages/EasingFunctionPage.xaml
+++ b/WinUIGallery/ControlPages/EasingFunctionPage.xaml
@@ -144,8 +144,8 @@
                 <StackPanel>
                     <ComboBox x:Name="EasingComboBox" AutomationProperties.Name="Easing type" ItemsSource="{x:Bind EasingFunctions}" 
                               DisplayMemberPath="Name" SelectedValuePath="EasingFunctionBase" Loaded="EasingComboBox_Loaded"/>
-                    <RadioButtons>
-                        <RadioButton x:Name="easeOutRB" Content="EaseOut" IsChecked="True" />
+                    <RadioButtons x:Name="EasingModeRadioButtons" SelectedIndex="0">
+                        <RadioButton x:Name="easeOutRB" Content="EaseOut" />
                         <RadioButton x:Name="easeInRB" Content="EaseIn" />
                         <RadioButton x:Name="easeInOutRB" Content="EaseInOut" />
                     </RadioButtons>
@@ -177,7 +177,7 @@
 &lt;Storyboard x:Name="Storyboard3"&gt;
     &lt;DoubleAnimation Storyboard.TargetName="Translation" Storyboard.TargetProperty="X" From="0" To="200" &gt;
         &lt;DoubleAnimation.EasingFunction&gt;
-            &lt;$(EasingFunction)/&gt;
+            &lt;$(EasingFunction) EasingMode="$(EasingMode)"/&gt;
         &lt;/DoubleAnimation.EasingFunction&gt;
     &lt;/DoubleAnimation&gt;
 &lt;/Storyboard&gt;
@@ -185,6 +185,7 @@
             </local:ControlExample.Xaml>
             <local:ControlExample.Substitutions>
                 <local:ControlExampleSubstitution Key="EasingFunction" Value="{x:Bind ((control:NamedEasingFunction)EasingComboBox.SelectedItem).Name, Mode=OneWay}" />
+                <local:ControlExampleSubstitution Key="EasingMode" Value="{x:Bind ((RadioButton)EasingModeRadioButtons.SelectedItem).Content, Mode=OneWay}"/>
             </local:ControlExample.Substitutions>
         </local:ControlExample>
     </StackPanel>
diff --git a/WinUIGallery/ControlPages/NumberBoxPage.xaml b/WinUIGallery/ControlPages/NumberBoxPage.xaml
index b948098aa..6717a9234 100644
--- a/WinUIGallery/ControlPages/NumberBoxPage.xaml
+++ b/WinUIGallery/ControlPages/NumberBoxPage.xaml
@@ -44,16 +44,13 @@
                 </NumberBox>
             </local:ControlExample.Example>
             <local:ControlExample.Options>
-                <RadioButtons x:Name="SpinButtonPlacementGroup" Header="SpinButton placement" SelectedIndex="1"  SelectionChanged="SpinButtonPlacementGroup_SelectionChanged">
-                    <!--<RadioButton Content="Inline" Tag="Inline" Checked="RadioButton_Checked" />
-                    <RadioButton Content="Compact" Tag="Compact" Checked="RadioButton_Checked" IsChecked="True" />-->
-                    <x:String>Inline</x:String>
-                    <x:String>Compact</x:String>
+                <RadioButtons x:Name="SpinButtonPlacementGroup" Header="SpinButton placement" SelectedIndex="1">
+                    <RadioButton Content="Inline" Tag="Inline" Checked="RadioButton_Checked" />
+                    <RadioButton Content="Compact" Tag="Compact" Checked="RadioButton_Checked" />
                 </RadioButtons>
             </local:ControlExample.Options>
             <local:ControlExample.Substitutions>
-                <!--<local:ControlExampleSubstitution Key="SpinButtonPlacementMode" Value="{x:Bind ((RadioButton)SpinButtonPlacementGroup.SelectedItem).Content, Mode=OneWay, TargetNullValue='Compact'}"/>-->
-                <local:ControlExampleSubstitution Key="SpinButtonPlacementMode" Value="{x:Bind SpinButtonPlacementGroup.SelectedItem, Mode=OneWay}"/>
+                <local:ControlExampleSubstitution Key="SpinButtonPlacementMode" Value="{x:Bind ((RadioButton)SpinButtonPlacementGroup.SelectedItem).Content, Mode=OneWay}"/>
             </local:ControlExample.Substitutions>
         </local:ControlExample>
         
diff --git a/WinUIGallery/ControlPages/NumberBoxPage.xaml.cs b/WinUIGallery/ControlPages/NumberBoxPage.xaml.cs
index 5c097054c..2f98e245a 100644
--- a/WinUIGallery/ControlPages/NumberBoxPage.xaml.cs
+++ b/WinUIGallery/ControlPages/NumberBoxPage.xaml.cs
@@ -38,16 +38,21 @@ private void SetNumberBoxNumberFormatter()
             FormattedNumberBox.NumberFormatter = formatter;
         }
 
-        private void SpinButtonPlacementGroup_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        private void RadioButton_Checked(object sender, RoutedEventArgs e)
         {
-            switch(SpinButtonPlacementGroup.SelectedItem as string)
+            if (sender is RadioButton rb && NumberBoxSpinButtonPlacementExample != null)
             {
-                case "Inline":
-                    NumberBoxSpinButtonPlacementExample.SpinButtonPlacementMode = NumberBoxSpinButtonPlacementMode.Inline;
-                    break;
-                case "Compact":
-                    NumberBoxSpinButtonPlacementExample.SpinButtonPlacementMode = NumberBoxSpinButtonPlacementMode.Compact;
-                    break;
+                string spinButtonPlacementModeName = rb.Tag.ToString();
+
+                switch (spinButtonPlacementModeName)
+                {
+                    case "Inline":
+                        NumberBoxSpinButtonPlacementExample.SpinButtonPlacementMode = NumberBoxSpinButtonPlacementMode.Inline;
+                        break;
+                    case "Compact":
+                        NumberBoxSpinButtonPlacementExample.SpinButtonPlacementMode = NumberBoxSpinButtonPlacementMode.Compact;
+                        break;
+                }
             }
         }
     }