Fix Surface Dial Helpers to function as well as before

Add RotationResolutionInDegrees customization
Still some issues with Menu deregistration tracked in #3774

Author: michael-hawker

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/SurfaceDialTextbox/SurfaceDialTextboxCode.bind

@@ -12,12 +12,12 @@
     <TextBox HorizontalAlignment="Left"
               VerticalAlignment="Top"
               Margin="0,0,0,10"
-              Text="0"
+              Text="50"
               Width="250">
       <ui:TextBoxExtensions.SurfaceDialOptions>
         <ui:SurfaceDialOptions
             StepValue="1"
-            ForceMenuItem="True"
+            RotationResolutionInDegrees="12"
             EnableHapticFeedback="True"
             EnableMinMaxValue="True"
             MinValue="0"

Microsoft.Toolkit.Uwp.UI/Extensions/TextBox/SurfaceDialOptions.cs

@@ -5,6 +5,7 @@
 using Windows.UI.Input;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Input;
 
 namespace Microsoft.Toolkit.Uwp.UI
 {
@@ -18,12 +19,6 @@ public sealed class SurfaceDialOptions : DependencyObject
         /// </summary>
         internal static SurfaceDialOptions Default { get; } = new();
 
-        /// <summary>
-        /// Gets or sets a value indicating whether new menu items shouldn't be added automatically.
-        /// This should be set to <see langword="true"/> if you provide the <see cref="RadialController"/> yourself.
-        /// </summary>
-        public bool ForceMenuItem { get; set; }
-
         /// <summary>
         /// Gets or sets the default icon of the menu item that gets added.
         /// This will be visible if a user opens their Surface Dial menu by long-pressing the device.
@@ -32,7 +27,7 @@ public sealed class SurfaceDialOptions : DependencyObject
         public RadialControllerMenuKnownIcon Icon { get; set; } = RadialControllerMenuKnownIcon.Ruler;
 
         /// <summary>
-        /// Gets or sets the amount the <see cref="TextBox"/> will be modified for each rotation step on the Surface Dial.
+        /// Gets or sets the amount the <see cref="TextBox"/> value will be modified for each <see cref="RotationResolutionInDegrees"/> step on the Surface Dial.
         /// This can be any double value.
         /// </summary>
         public double StepValue { get; set; }
@@ -43,6 +38,11 @@ public sealed class SurfaceDialOptions : DependencyObject
         /// </summary>
         public bool EnableHapticFeedback { get; set; } = true;
 
+        /// <summary>
+        /// Gets or sets the <see cref="RadialController.RotationResolutionInDegrees"/> property for the extension which is the amount the dial needs to rotate to trigger a change. Default is 10.
+        /// </summary>
+        public double RotationResolutionInDegrees { get; set; } = 10;
+
         /// <summary>
         /// Gets or sets the minimum value the <see cref="TextBox"/> can have when modifying it using a Surface Dial.
         /// Default is -100.0.

Microsoft.Toolkit.Uwp.UI/Extensions/TextBox/TextBoxExtensions.SurfaceDial.cs

@@ -74,9 +74,12 @@ public static bool IsSurfaceDialOptionsSupported
         /// This helper class will do everything for you, but if you want to control the Menu Items and/or wish to use the same Surface Dial instance
         /// This is the property for the static controller so you can access it if needed.
         /// </summary>
-        public static RadialController? Controller
+        public static RadialController Controller
         {
-            get => _controller;
+            get
+            {
+                return _controller ??= RadialController.CreateForCurrentView();
+            }
             set => _controller = value;
         }
 
@@ -99,7 +102,9 @@ private static void Controller_RotationChanged(RadialController sender, RadialCo
 
             if (double.TryParse(text, out double number))
             {
-                number += args.RotationDeltaInDegrees * options.StepValue;
+                // We only care about the sign of RotationDeltaInDegrees to determine if we're going up/down
+                // The value is controlled by the StepValue independent of when we should call the rotation changed event.
+                number += Math.Sign(args.RotationDeltaInDegrees) * options.StepValue;
 
                 if (options.EnableMinMaxValue)
                 {
@@ -131,10 +136,17 @@ private static void OnSurfaceDialOptionsPropertyChanged(DependencyObject d, Depe
                 return;
             }
 
+            // Initialize our RadialController once.
+            _controller ??= RadialController.CreateForCurrentView();
+
             textBox.GotFocus -= TextBox_GotFocus_SurfaceDial;
             textBox.LostFocus -= TextBox_LostFocus_SurfaceDial;
-            textBox.GotFocus += TextBox_GotFocus_SurfaceDial;
-            textBox.LostFocus += TextBox_LostFocus_SurfaceDial;
+
+            if (e.NewValue is not null)
+            {
+                textBox.GotFocus += TextBox_GotFocus_SurfaceDial;
+                textBox.LostFocus += TextBox_LostFocus_SurfaceDial;
+            }
         }
 
         /// <summary>
@@ -152,7 +164,7 @@ private static void TextBox_LostFocus_SurfaceDial(object sender, RoutedEventArgs
 
             SurfaceDialOptions? options = GetSurfaceDialOptions(_textBox) ?? SurfaceDialOptions.Default;
 
-            if (options.ForceMenuItem)
+            if (_stepTextMenuItem is not null)
             {
                 _controller.Menu.Items.Remove(_stepTextMenuItem);
             }
@@ -176,7 +188,8 @@ private static void TextBox_GotFocus_SurfaceDial(object sender, RoutedEventArgs
         {
             _textBox = sender as TextBox;
 
-            if (_textBox is null)
+            if (_textBox is null ||
+                _controller is null)
             {
                 return;
             }
@@ -186,19 +199,21 @@ private static void TextBox_GotFocus_SurfaceDial(object sender, RoutedEventArgs
                 return;
             }
 
-            _controller ??= RadialController.CreateForCurrentView();
+            if (_controller is not null)
+            {
+                _controller.RotationChanged -= Controller_RotationChanged;
+                _controller.ButtonClicked -= Controller_ButtonClicked;
+            }
 
             SurfaceDialOptions? options = GetSurfaceDialOptions(_textBox) ?? SurfaceDialOptions.Default;
 
-            if (options.ForceMenuItem)
-            {
-                _stepTextMenuItem = RadialControllerMenuItem.CreateFromKnownIcon("Step Text Box", options.Icon);
-                _controller.Menu.Items.Add(_stepTextMenuItem);
-                _controller.Menu.SelectMenuItem(_stepTextMenuItem);
-            }
+            _stepTextMenuItem ??= RadialControllerMenuItem.CreateFromKnownIcon("Step Text Box", options.Icon);
+
+            _controller.Menu.Items.Add(_stepTextMenuItem);
+            _controller.Menu.SelectMenuItem(_stepTextMenuItem);
 
             _controller.UseAutomaticHapticFeedback = options.EnableHapticFeedback;
-            _controller.RotationResolutionInDegrees = 1;
+            _controller.RotationResolutionInDegrees = options.RotationResolutionInDegrees;
             _controller.RotationChanged += Controller_RotationChanged;
 
             if (options.EnableTapToNextControl)