Only update font size on select font

or on enter for text input

Author: Rosuavio

Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/InfiniteCanvas.TextBox.cs

@@ -28,28 +28,20 @@ public partial class InfiniteCanvas
             "Right",
             "Up",
             "Left",
-            "Down"
+            "Down",
+            "Enter"
         };
 
         private Point _lastInputPoint;
 
         private TextDrawable SelectedTextDrawable => _drawingSurfaceRenderer.GetSelectedTextDrawable();
 
-        private float _lastValidTextFontSizeValue = DefaultFontValue;
+        private float _textFontSize = DefaultFontValue;
 
-        private float TextFontSize
+        private void SetFontSize(float newSize)
         {
-            get
-            {
-                if (!string.IsNullOrWhiteSpace(_canvasComboBoxFontSizeTextBox.SelectedValue.ToString()) &&
-                    Regex.IsMatch(_canvasComboBoxFontSizeTextBox.Text, "^[0-9]*$"))
-                {
-                    var fontSize = float.Parse((_canvasComboBoxFontSizeTextBox.SelectedItem as ComboBoxItem).Content.ToString());
-                    _lastValidTextFontSizeValue = fontSize;
-                }
-
-                return _lastValidTextFontSizeValue;
-            }
+            _textFontSize = newSize;
+            _canvasTextBox.UpdateFontSize(newSize);
         }
 
         private void InkScrollViewer_PreviewKeyDown(object sender, KeyRoutedEventArgs e)
@@ -95,11 +87,26 @@ private void CanvasTextBoxItalicButton_Clicked(object sender, RoutedEventArgs e)
 
         private void CanvasComboBoxFontSizeTextBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
-            _canvasTextBox.UpdateFontSize(TextFontSize);
-            if (SelectedTextDrawable != null)
+            if (sender is ComboBox s
+                && s.SelectedItem is ComboBoxItem selectedItem
+                && selectedItem.Content is string selectedText
+                && float.TryParse(selectedText, out var sizeNumb))
             {
-                _drawingSurfaceRenderer.ExecuteUpdateTextBoxFontSize(TextFontSize);
-                ReDrawCanvas();
+                SetFontSize(sizeNumb);
+
+                if (SelectedTextDrawable != null)
+                {
+                    _drawingSurfaceRenderer.ExecuteUpdateTextBoxFontSize(sizeNumb);
+                    ReDrawCanvas();
+                }
+            }
+        }
+
+        private void CanvasComboBoxFontSizeTextBox_TextSubmitted(ComboBox sender, ComboBoxTextSubmittedEventArgs args)
+        {
+            if (float.TryParse(args.Text, out var size))
+            {
+                SetFontSize(size);
             }
         }
 
@@ -147,20 +154,22 @@ private void CanvasTextBox_TextChanged(object sender, string text)
                 ReDrawCanvas();
                 return;
             }
+            else
+            {
+                _drawingSurfaceRenderer.ExecuteCreateTextBox(
+                    _lastInputPoint.X,
+                    _lastInputPoint.Y,
+                    _canvasTextBox.GetEditZoneWidth(),
+                    _canvasTextBox.GetEditZoneHeight(),
+                    _textFontSize,
+                    text,
+                    _canvasTextBoxColorPicker.Color,
+                    _canvasTextBoxBoldButton.IsChecked ?? false,
+                    _canvasTextBoxItalicButton.IsChecked ?? false);
 
-            _drawingSurfaceRenderer.ExecuteCreateTextBox(
-                _lastInputPoint.X,
-                _lastInputPoint.Y,
-                _canvasTextBox.GetEditZoneWidth(),
-                _canvasTextBox.GetEditZoneHeight(),
-                TextFontSize,
-                text,
-                _canvasTextBoxColorPicker.Color,
-                _canvasTextBoxBoldButton.IsChecked ?? false,
-                _canvasTextBoxItalicButton.IsChecked ?? false);
-
-            ReDrawCanvas();
-            _drawingSurfaceRenderer.UpdateSelectedTextDrawable();
+                ReDrawCanvas();
+                _drawingSurfaceRenderer.UpdateSelectedTextDrawable();
+            }
         }
 
         private void InkScrollViewer_PointerPressed(object sender, PointerRoutedEventArgs e)
@@ -179,7 +188,6 @@ private void InkScrollViewer_PointerPressed(object sender, PointerRoutedEventArg
 
                     Canvas.SetLeft(_canvasTextBox, SelectedTextDrawable.Bounds.X);
                     Canvas.SetTop(_canvasTextBox, SelectedTextDrawable.Bounds.Y);
-                    _canvasTextBox.UpdateFontSize(SelectedTextDrawable.FontSize);
                     _canvasTextBox.UpdateFontStyle(SelectedTextDrawable.IsItalic);
                     _canvasTextBox.UpdateFontWeight(SelectedTextDrawable.IsBold);
 
@@ -192,7 +200,6 @@ private void InkScrollViewer_PointerPressed(object sender, PointerRoutedEventArg
                     return;
                 }
 
-                _canvasTextBox.UpdateFontSize(TextFontSize);
                 _canvasTextBox.UpdateFontStyle(_canvasTextBoxItalicButton.IsChecked ?? false);
                 _canvasTextBox.UpdateFontWeight(_canvasTextBoxBoldButton.IsChecked ?? false);
 

Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/InfiniteCanvas.cs

@@ -315,6 +315,7 @@ private void UnRegisterEvents()
             Application.Current.LeavingBackground -= Current_LeavingBackground;
             _drawingSurfaceRenderer.CommandExecuted -= DrawingSurfaceRenderer_CommandExecuted;
             _canvasComboBoxFontSizeTextBox.PreviewKeyDown -= CanvasComboBoxFontSizeTextBox_PreviewKeyDown;
+            _canvasComboBoxFontSizeTextBox.TextSubmitted -= CanvasComboBoxFontSizeTextBox_TextSubmitted;
             Loaded -= InfiniteCanvas_Loaded;
         }
 
@@ -339,6 +340,7 @@ private void RegisterEvents()
             Application.Current.LeavingBackground += Current_LeavingBackground;
             _drawingSurfaceRenderer.CommandExecuted += DrawingSurfaceRenderer_CommandExecuted;
             _canvasComboBoxFontSizeTextBox.PreviewKeyDown += CanvasComboBoxFontSizeTextBox_PreviewKeyDown;
+            _canvasComboBoxFontSizeTextBox.TextSubmitted += CanvasComboBoxFontSizeTextBox_TextSubmitted;
             Loaded += InfiniteCanvas_Loaded;
         }
 
@@ -366,7 +368,7 @@ private void ConfigureControls()
 
             SetCanvasWidthHeight();
 
-            _canvasTextBox.UpdateFontSize(TextFontSize);
+            SetFontSize(_textFontSize);
         }
 
         private void SetZoomFactor()