Skip to content

Commit 2dd783d

Browse files
Fix "Italic" checkstate bug + fix "italic" typo in InfiniteCanvas control (#3117)
* Fix "italic" typo itlaic -> italic * Fix "Italic" check state getting out of sync when re-selecting text Co-authored-by: Michael Hawker MSFT (XAML Llama) <michael.hawker@outlook.com>
1 parent 469d951 commit 2dd783d

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,11 @@ private void CanvasTextBoxBoldButton_Clicked(object sender, RoutedEventArgs e)
8383
}
8484
}
8585

86-
private void CanvasTextBoxItlaicButton_Clicked(object sender, RoutedEventArgs e)
86+
private void CanvasTextBoxItalicButton_Clicked(object sender, RoutedEventArgs e)
8787
{
8888
if (SelectedTextDrawable != null)
8989
{
90-
_drawingSurfaceRenderer.ExecuteUpdateTextBoxStyle(_canvasTextBoxItlaicButton.IsChecked ?? false);
90+
_drawingSurfaceRenderer.ExecuteUpdateTextBoxStyle(_canvasTextBoxItalicButton.IsChecked ?? false);
9191
_canvasTextBox.UpdateFontStyle(SelectedTextDrawable.IsItalic);
9292
ReDrawCanvas();
9393
}
@@ -154,7 +154,7 @@ private void CanvasTextBox_TextChanged(object sender, string text)
154154
text,
155155
_canvasTextBoxColorPicker.Color,
156156
_canvasTextBoxBoldButton.IsChecked ?? false,
157-
_canvasTextBoxItlaicButton.IsChecked ?? false);
157+
_canvasTextBoxItalicButton.IsChecked ?? false);
158158

159159
ReDrawCanvas();
160160
_drawingSurfaceRenderer.UpdateSelectedTextDrawable();
@@ -184,13 +184,13 @@ private void InkScrollViewer_PointerPressed(object sender, PointerRoutedEventArg
184184
_canvasTextBoxColorPicker.Color = SelectedTextDrawable.TextColor;
185185
_canvasTextBoxFontSizeTextBox.Text = SelectedTextDrawable.FontSize.ToString();
186186
_canvasTextBoxBoldButton.IsChecked = SelectedTextDrawable.IsBold;
187-
_canvasTextBoxItlaicButton.IsChecked = SelectedTextDrawable.IsBold;
187+
_canvasTextBoxItalicButton.IsChecked = SelectedTextDrawable.IsItalic;
188188

189189
return;
190190
}
191191

192192
_canvasTextBox.UpdateFontSize(TextFontSize);
193-
_canvasTextBox.UpdateFontStyle(_canvasTextBoxItlaicButton.IsChecked ?? false);
193+
_canvasTextBox.UpdateFontStyle(_canvasTextBoxItalicButton.IsChecked ?? false);
194194
_canvasTextBox.UpdateFontWeight(_canvasTextBoxBoldButton.IsChecked ?? false);
195195

196196
_inkCanvas.Visibility = Visibility.Collapsed;

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public partial class InfiniteCanvas : Control
3535
private ColorPicker _canvasTextBoxColorPicker;
3636

3737
private TextBox _canvasTextBoxFontSizeTextBox;
38-
private ToggleButton _canvasTextBoxItlaicButton;
38+
private ToggleButton _canvasTextBoxItalicButton;
3939
private ToggleButton _canvasTextBoxBoldButton;
4040
private Button _undoButton;
4141
private Button _redoButton;
@@ -166,7 +166,7 @@ protected override void OnApplyTemplate()
166166
_canvasTextBoxTools = (StackPanel)GetTemplateChild("CanvasTextBoxTools");
167167
_canvasTextBoxColorPicker = (ColorPicker)GetTemplateChild("CanvasTextBoxColorPicker");
168168
_canvasTextBoxFontSizeTextBox = (TextBox)GetTemplateChild("CanvasTextBoxFontSizeTextBox");
169-
_canvasTextBoxItlaicButton = (ToggleButton)GetTemplateChild("CanvasTextBoxItlaicButton");
169+
_canvasTextBoxItalicButton = (ToggleButton)GetTemplateChild("CanvasTextBoxItalicButton");
170170
_canvasTextBoxBoldButton = (ToggleButton)GetTemplateChild("CanvasTextBoxBoldButton");
171171
_drawingSurfaceRenderer = (InfiniteCanvasVirtualDrawingSurface)GetTemplateChild("DrawingSurfaceRenderer");
172172
_mainContainer = (Canvas)GetTemplateChild("MainContainer");
@@ -204,7 +204,7 @@ protected override void OnApplyTemplate()
204204
private void UnRegisterEvents()
205205
{
206206
_canvasTextBoxFontSizeTextBox.TextChanged -= CanvasTextBoxFontSizeTextBox_TextChanged;
207-
_canvasTextBoxItlaicButton.Click -= CanvasTextBoxItlaicButton_Clicked;
207+
_canvasTextBoxItalicButton.Click -= CanvasTextBoxItalicButton_Clicked;
208208
_canvasTextBoxBoldButton.Click -= CanvasTextBoxBoldButton_Clicked;
209209
_canvasTextBoxColorPicker.ColorChanged -= CanvasTextBoxColorPicker_ColorChanged;
210210
_enableTouchInkingButton.Checked -= EnableTouchInkingButton_Checked;
@@ -228,7 +228,7 @@ private void UnRegisterEvents()
228228
private void RegisterEvents()
229229
{
230230
_canvasTextBoxFontSizeTextBox.TextChanged += CanvasTextBoxFontSizeTextBox_TextChanged;
231-
_canvasTextBoxItlaicButton.Click += CanvasTextBoxItlaicButton_Clicked;
231+
_canvasTextBoxItalicButton.Click += CanvasTextBoxItalicButton_Clicked;
232232
_canvasTextBoxBoldButton.Click += CanvasTextBoxBoldButton_Clicked;
233233
_canvasTextBoxColorPicker.ColorChanged += CanvasTextBoxColorPicker_ColorChanged;
234234
_enableTouchInkingButton.Checked += EnableTouchInkingButton_Checked;

Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/InfiniteCanvas.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
</ToggleButton.Content>
8989
</ToggleButton>
9090

91-
<ToggleButton x:Name="CanvasTextBoxItlaicButton"
91+
<ToggleButton x:Name="CanvasTextBoxItalicButton"
9292
Style="{StaticResource CanvasTextBoxToggleButtonStyle}"
9393
ToolTipService.ToolTip="Italic Text">
9494
<ToggleButton.Content>

0 commit comments

Comments
 (0)