From 693353f7f46fbc1e35629090e3ebcca7f7bf6655 Mon Sep 17 00:00:00 2001 From: Ronan Burke Date: Fri, 31 Jan 2020 22:21:03 +0000 Subject: [PATCH 1/2] Fix "italic" typo itlaic -> italic --- .../InfiniteCanvas/InfiniteCanvas.TextBox.cs | 10 +++++----- .../InfiniteCanvas/InfiniteCanvas.cs | 8 ++++---- .../InfiniteCanvas/InfiniteCanvas.xaml | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/InfiniteCanvas.TextBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/InfiniteCanvas.TextBox.cs index 31e256f9627..a744cb8d664 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/InfiniteCanvas.TextBox.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/InfiniteCanvas.TextBox.cs @@ -83,11 +83,11 @@ private void CanvasTextBoxBoldButton_Clicked(object sender, RoutedEventArgs e) } } - private void CanvasTextBoxItlaicButton_Clicked(object sender, RoutedEventArgs e) + private void CanvasTextBoxItalicButton_Clicked(object sender, RoutedEventArgs e) { if (SelectedTextDrawable != null) { - _drawingSurfaceRenderer.ExecuteUpdateTextBoxStyle(_canvasTextBoxItlaicButton.IsChecked ?? false); + _drawingSurfaceRenderer.ExecuteUpdateTextBoxStyle(_canvasTextBoxItalicButton.IsChecked ?? false); _canvasTextBox.UpdateFontStyle(SelectedTextDrawable.IsItalic); ReDrawCanvas(); } @@ -154,7 +154,7 @@ private void CanvasTextBox_TextChanged(object sender, string text) text, _canvasTextBoxColorPicker.Color, _canvasTextBoxBoldButton.IsChecked ?? false, - _canvasTextBoxItlaicButton.IsChecked ?? false); + _canvasTextBoxItalicButton.IsChecked ?? false); ReDrawCanvas(); _drawingSurfaceRenderer.UpdateSelectedTextDrawable(); @@ -184,13 +184,13 @@ private void InkScrollViewer_PointerPressed(object sender, PointerRoutedEventArg _canvasTextBoxColorPicker.Color = SelectedTextDrawable.TextColor; _canvasTextBoxFontSizeTextBox.Text = SelectedTextDrawable.FontSize.ToString(); _canvasTextBoxBoldButton.IsChecked = SelectedTextDrawable.IsBold; - _canvasTextBoxItlaicButton.IsChecked = SelectedTextDrawable.IsBold; + _canvasTextBoxItalicButton.IsChecked = SelectedTextDrawable.IsBold; return; } _canvasTextBox.UpdateFontSize(TextFontSize); - _canvasTextBox.UpdateFontStyle(_canvasTextBoxItlaicButton.IsChecked ?? false); + _canvasTextBox.UpdateFontStyle(_canvasTextBoxItalicButton.IsChecked ?? false); _canvasTextBox.UpdateFontWeight(_canvasTextBoxBoldButton.IsChecked ?? false); _inkCanvas.Visibility = Visibility.Collapsed; diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/InfiniteCanvas.cs b/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/InfiniteCanvas.cs index d8ee6229ab7..90134e7b601 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/InfiniteCanvas.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/InfiniteCanvas.cs @@ -35,7 +35,7 @@ public partial class InfiniteCanvas : Control private ColorPicker _canvasTextBoxColorPicker; private TextBox _canvasTextBoxFontSizeTextBox; - private ToggleButton _canvasTextBoxItlaicButton; + private ToggleButton _canvasTextBoxItalicButton; private ToggleButton _canvasTextBoxBoldButton; private Button _undoButton; private Button _redoButton; @@ -166,7 +166,7 @@ protected override void OnApplyTemplate() _canvasTextBoxTools = (StackPanel)GetTemplateChild("CanvasTextBoxTools"); _canvasTextBoxColorPicker = (ColorPicker)GetTemplateChild("CanvasTextBoxColorPicker"); _canvasTextBoxFontSizeTextBox = (TextBox)GetTemplateChild("CanvasTextBoxFontSizeTextBox"); - _canvasTextBoxItlaicButton = (ToggleButton)GetTemplateChild("CanvasTextBoxItlaicButton"); + _canvasTextBoxItalicButton = (ToggleButton)GetTemplateChild("CanvasTextBoxItalicButton"); _canvasTextBoxBoldButton = (ToggleButton)GetTemplateChild("CanvasTextBoxBoldButton"); _drawingSurfaceRenderer = (InfiniteCanvasVirtualDrawingSurface)GetTemplateChild("DrawingSurfaceRenderer"); _mainContainer = (Canvas)GetTemplateChild("MainContainer"); @@ -204,7 +204,7 @@ protected override void OnApplyTemplate() private void UnRegisterEvents() { _canvasTextBoxFontSizeTextBox.TextChanged -= CanvasTextBoxFontSizeTextBox_TextChanged; - _canvasTextBoxItlaicButton.Click -= CanvasTextBoxItlaicButton_Clicked; + _canvasTextBoxItalicButton.Click -= CanvasTextBoxItalicButton_Clicked; _canvasTextBoxBoldButton.Click -= CanvasTextBoxBoldButton_Clicked; _canvasTextBoxColorPicker.ColorChanged -= CanvasTextBoxColorPicker_ColorChanged; _enableTouchInkingButton.Checked -= EnableTouchInkingButton_Checked; @@ -228,7 +228,7 @@ private void UnRegisterEvents() private void RegisterEvents() { _canvasTextBoxFontSizeTextBox.TextChanged += CanvasTextBoxFontSizeTextBox_TextChanged; - _canvasTextBoxItlaicButton.Click += CanvasTextBoxItlaicButton_Clicked; + _canvasTextBoxItalicButton.Click += CanvasTextBoxItalicButton_Clicked; _canvasTextBoxBoldButton.Click += CanvasTextBoxBoldButton_Clicked; _canvasTextBoxColorPicker.ColorChanged += CanvasTextBoxColorPicker_ColorChanged; _enableTouchInkingButton.Checked += EnableTouchInkingButton_Checked; diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/InfiniteCanvas.xaml b/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/InfiniteCanvas.xaml index 69e2148f6be..3b77cf7bc0c 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/InfiniteCanvas.xaml +++ b/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/InfiniteCanvas.xaml @@ -88,7 +88,7 @@ - From 9f80d44e4f3722ce263db0b239960962154f627d Mon Sep 17 00:00:00 2001 From: Ronan Burke Date: Fri, 31 Jan 2020 23:00:13 +0000 Subject: [PATCH 2/2] Fix "Italic" check state getting out of sync when re-selecting text --- .../InfiniteCanvas/InfiniteCanvas.TextBox.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/InfiniteCanvas.TextBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/InfiniteCanvas.TextBox.cs index a744cb8d664..c8559f9933e 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/InfiniteCanvas.TextBox.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/InfiniteCanvas.TextBox.cs @@ -184,7 +184,7 @@ private void InkScrollViewer_PointerPressed(object sender, PointerRoutedEventArg _canvasTextBoxColorPicker.Color = SelectedTextDrawable.TextColor; _canvasTextBoxFontSizeTextBox.Text = SelectedTextDrawable.FontSize.ToString(); _canvasTextBoxBoldButton.IsChecked = SelectedTextDrawable.IsBold; - _canvasTextBoxItalicButton.IsChecked = SelectedTextDrawable.IsBold; + _canvasTextBoxItalicButton.IsChecked = SelectedTextDrawable.IsItalic; return; }