Skip to content

Commit 79661ed

Browse files
salmanmkcRosuavio
authored andcommitted
capitalisation corrections
1 parent 89d3c6a commit 79661ed

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ private int TextFontSize
4141
{
4242
get
4343
{
44-
if (!string.IsNullOrWhiteSpace(_canvasTextBoxFontSizeTextBox.SelectedValue.ToString()) &&
45-
Regex.IsMatch(_canvasTextBoxFontSizeTextBox.Text, "^[0-9]*$"))
44+
if (!string.IsNullOrWhiteSpace(_canvasComboBoxFontSizeTextBox.SelectedValue.ToString()) &&
45+
Regex.IsMatch(_canvasComboBoxFontSizeTextBox.Text, "^[0-9]*$"))
4646
{
47-
var fontSize = int.Parse((_canvasTextBoxFontSizeTextBox.SelectedItem as ComboBoxItem).Content.ToString());
47+
var fontSize = int.Parse((_canvasComboBoxFontSizeTextBox.SelectedItem as ComboBoxItem).Content.ToString());
4848
_lastValidTextFontSizeValue = fontSize;
4949
}
5050

@@ -93,7 +93,7 @@ private void CanvasTextBoxItalicButton_Clicked(object sender, RoutedEventArgs e)
9393
}
9494
}
9595

96-
private void CanvasTextBoxFontSizeTextBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
96+
private void CanvasComboBoxFontSizeTextBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
9797
{
9898
_canvasTextBox.UpdateFontSize(TextFontSize);
9999
if (SelectedTextDrawable != null)
@@ -185,7 +185,7 @@ private void InkScrollViewer_PointerPressed(object sender, PointerRoutedEventArg
185185

186186
// Updating toolbar
187187
_canvasTextBoxColorPicker.Color = SelectedTextDrawable.TextColor;
188-
_canvasTextBoxFontSizeTextBox.Text = SelectedTextDrawable.FontSize.ToString();
188+
_canvasComboBoxFontSizeTextBox.Text = SelectedTextDrawable.FontSize.ToString();
189189
_canvasTextBoxBoldButton.IsChecked = SelectedTextDrawable.IsBold;
190190
_canvasTextBoxItalicButton.IsChecked = SelectedTextDrawable.IsItalic;
191191

@@ -210,7 +210,7 @@ private void ClearTextBoxValue()
210210
_canvasTextBox.Clear();
211211
}
212212

213-
private void CanvasTextBoxFontSizeTextBox_PreviewKeyDown(object sender, KeyRoutedEventArgs e)
213+
private void CanvasComboBoxFontSizeTextBox_PreviewKeyDown(object sender, KeyRoutedEventArgs e)
214214
{
215215
if (_allowedCommands.Contains(e.Key.ToString()))
216216
{

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls
2121
/// </summary>
2222
[TemplatePart(Name = CanvasTextBoxToolsName, Type = typeof(StackPanel))]
2323
[TemplatePart(Name = CanvasTextBoxColorPickerName, Type = typeof(Windows.UI.Xaml.Controls.ColorPicker))]
24-
[TemplatePart(Name = CanvasTextBoxFontSizeTextBoxName, Type = typeof(TextBox))]
24+
[TemplatePart(Name = CanvasComboBoxFontSizeTextBoxName, Type = typeof(TextBox))]
2525
[TemplatePart(Name = CanvasTextBoxItalicButtonName, Type = typeof(ToggleButton))]
2626
[TemplatePart(Name = CanvasTextBoxBoldButtonName, Type = typeof(ToggleButton))]
2727
[TemplatePart(Name = DrawingSurfaceRendererName, Type = typeof(InfiniteCanvasVirtualDrawingSurface))]
@@ -45,7 +45,7 @@ public partial class InfiniteCanvas : Control
4545

4646
private const string CanvasTextBoxToolsName = "CanvasTextBoxTools";
4747
private const string CanvasTextBoxColorPickerName = "CanvasTextBoxColorPicker";
48-
private const string CanvasTextBoxFontSizeTextBoxName = "CanvasTextBoxFontSizeTextBox";
48+
private const string CanvasComboBoxFontSizeTextBoxName = "CanvasComboBoxFontSizeTextBox";
4949
private const string CanvasTextBoxItalicButtonName = "CanvasTextBoxItalicButton";
5050
private const string CanvasTextBoxBoldButtonName = "CanvasTextBoxBoldButton";
5151
private const string DrawingSurfaceRendererName = "DrawingSurfaceRenderer";
@@ -71,7 +71,7 @@ public partial class InfiniteCanvas : Control
7171
private StackPanel _canvasTextBoxTools;
7272
private Windows.UI.Xaml.Controls.ColorPicker _canvasTextBoxColorPicker;
7373

74-
private ComboBox _canvasTextBoxFontSizeTextBox;
74+
private ComboBox _canvasComboBoxFontSizeTextBox;
7575
private ToggleButton _canvasTextBoxItalicButton;
7676
private ToggleButton _canvasTextBoxBoldButton;
7777
private Button _undoButton;
@@ -244,7 +244,7 @@ protected override void OnApplyTemplate()
244244
{
245245
_canvasTextBoxTools = (StackPanel)GetTemplateChild(CanvasTextBoxToolsName);
246246
this._canvasTextBoxColorPicker = (Windows.UI.Xaml.Controls.ColorPicker)GetTemplateChild(CanvasTextBoxColorPickerName);
247-
_canvasTextBoxFontSizeTextBox = (ComboBox)GetTemplateChild(CanvasTextBoxFontSizeTextBoxName);
247+
_canvasComboBoxFontSizeTextBox = (ComboBox)GetTemplateChild(CanvasComboBoxFontSizeTextBoxName);
248248
_canvasTextBoxItalicButton = (ToggleButton)GetTemplateChild(CanvasTextBoxItalicButtonName);
249249
_canvasTextBoxBoldButton = (ToggleButton)GetTemplateChild(CanvasTextBoxBoldButtonName);
250250
_drawingSurfaceRenderer = (InfiniteCanvasVirtualDrawingSurface)GetTemplateChild(DrawingSurfaceRendererName);
@@ -296,7 +296,7 @@ protected override void OnApplyTemplate()
296296

297297
private void UnRegisterEvents()
298298
{
299-
_canvasTextBoxFontSizeTextBox.SelectionChanged -= CanvasTextBoxFontSizeTextBox_SelectionChanged;
299+
_canvasComboBoxFontSizeTextBox.SelectionChanged -= CanvasComboBoxFontSizeTextBox_SelectionChanged;
300300
_canvasTextBoxItalicButton.Click -= CanvasTextBoxItalicButton_Clicked;
301301
_canvasTextBoxBoldButton.Click -= CanvasTextBoxBoldButton_Clicked;
302302
_canvasTextBoxColorPicker.ColorChanged -= CanvasTextBoxColorPicker_ColorChanged;
@@ -314,13 +314,13 @@ private void UnRegisterEvents()
314314
Unloaded -= InfiniteCanvas_Unloaded;
315315
Application.Current.LeavingBackground -= Current_LeavingBackground;
316316
_drawingSurfaceRenderer.CommandExecuted -= DrawingSurfaceRenderer_CommandExecuted;
317-
_canvasTextBoxFontSizeTextBox.PreviewKeyDown -= CanvasTextBoxFontSizeTextBox_PreviewKeyDown;
317+
_canvasComboBoxFontSizeTextBox.PreviewKeyDown -= CanvasComboBoxFontSizeTextBox_PreviewKeyDown;
318318
Loaded -= InfiniteCanvas_Loaded;
319319
}
320320

321321
private void RegisterEvents()
322322
{
323-
_canvasTextBoxFontSizeTextBox.SelectionChanged += CanvasTextBoxFontSizeTextBox_SelectionChanged;
323+
_canvasComboBoxFontSizeTextBox.SelectionChanged += CanvasComboBoxFontSizeTextBox_SelectionChanged;
324324
_canvasTextBoxItalicButton.Click += CanvasTextBoxItalicButton_Clicked;
325325
_canvasTextBoxBoldButton.Click += CanvasTextBoxBoldButton_Clicked;
326326
_canvasTextBoxColorPicker.ColorChanged += CanvasTextBoxColorPicker_ColorChanged;
@@ -338,7 +338,7 @@ private void RegisterEvents()
338338
Unloaded += InfiniteCanvas_Unloaded;
339339
Application.Current.LeavingBackground += Current_LeavingBackground;
340340
_drawingSurfaceRenderer.CommandExecuted += DrawingSurfaceRenderer_CommandExecuted;
341-
_canvasTextBoxFontSizeTextBox.PreviewKeyDown += CanvasTextBoxFontSizeTextBox_PreviewKeyDown;
341+
_canvasComboBoxFontSizeTextBox.PreviewKeyDown += CanvasComboBoxFontSizeTextBox_PreviewKeyDown;
342342
Loaded += InfiniteCanvas_Loaded;
343343
}
344344

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
</ToggleButton.Content>
9898
</ToggleButton>
9999

100-
<ComboBox x:Name="CanvasTextBoxFontSizeTextBox"
100+
<ComboBox x:Name="CanvasComboBoxFontSizeTextBox"
101101
Width="64"
102102
Height="32" SelectedIndex="9" Margin="0,0,12,0" VerticalAlignment="Center">
103103
<ComboBoxItem Content="8" />

0 commit comments

Comments
 (0)