Skip to content

Commit 89d3c6a

Browse files
salmanmkcRosuavio
salmanmkc
authored and
Rosuavio
committed
Functionality done
1 parent 74de9e3 commit 89d3c6a

File tree

3 files changed

+36
-14
lines changed

3 files changed

+36
-14
lines changed

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

Lines changed: 3 additions & 3 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.Text) &&
44+
if (!string.IsNullOrWhiteSpace(_canvasTextBoxFontSizeTextBox.SelectedValue.ToString()) &&
4545
Regex.IsMatch(_canvasTextBoxFontSizeTextBox.Text, "^[0-9]*$"))
4646
{
47-
var fontSize = int.Parse(_canvasTextBoxFontSizeTextBox.Text);
47+
var fontSize = int.Parse((_canvasTextBoxFontSizeTextBox.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_TextChanged(object sender, TextChangedEventArgs e)
96+
private void CanvasTextBoxFontSizeTextBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
9797
{
9898
_canvasTextBox.UpdateFontSize(TextFontSize);
9999
if (SelectedTextDrawable != null)

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public partial class InfiniteCanvas : Control
7171
private StackPanel _canvasTextBoxTools;
7272
private Windows.UI.Xaml.Controls.ColorPicker _canvasTextBoxColorPicker;
7373

74-
private TextBox _canvasTextBoxFontSizeTextBox;
74+
private ComboBox _canvasTextBoxFontSizeTextBox;
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 = (TextBox)GetTemplateChild(CanvasTextBoxFontSizeTextBoxName);
247+
_canvasTextBoxFontSizeTextBox = (ComboBox)GetTemplateChild(CanvasTextBoxFontSizeTextBoxName);
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.TextChanged -= CanvasTextBoxFontSizeTextBox_TextChanged;
299+
_canvasTextBoxFontSizeTextBox.SelectionChanged -= CanvasTextBoxFontSizeTextBox_SelectionChanged;
300300
_canvasTextBoxItalicButton.Click -= CanvasTextBoxItalicButton_Clicked;
301301
_canvasTextBoxBoldButton.Click -= CanvasTextBoxBoldButton_Clicked;
302302
_canvasTextBoxColorPicker.ColorChanged -= CanvasTextBoxColorPicker_ColorChanged;
@@ -320,7 +320,7 @@ private void UnRegisterEvents()
320320

321321
private void RegisterEvents()
322322
{
323-
_canvasTextBoxFontSizeTextBox.TextChanged += CanvasTextBoxFontSizeTextBox_TextChanged;
323+
_canvasTextBoxFontSizeTextBox.SelectionChanged += CanvasTextBoxFontSizeTextBox_SelectionChanged;
324324
_canvasTextBoxItalicButton.Click += CanvasTextBoxItalicButton_Clicked;
325325
_canvasTextBoxBoldButton.Click += CanvasTextBoxBoldButton_Clicked;
326326
_canvasTextBoxColorPicker.ColorChanged += CanvasTextBoxColorPicker_ColorChanged;

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

Lines changed: 29 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -97,13 +97,35 @@
9797
</ToggleButton.Content>
9898
</ToggleButton>
9999

100-
<TextBox x:Name="CanvasTextBoxFontSizeTextBox"
101-
Width="64"
102-
Height="32"
103-
InputScope="Number"
104-
MaxLength="3"
105-
Text="22"
106-
ToolTipService.ToolTip="Font Size" />
100+
<ComboBox x:Name="CanvasTextBoxFontSizeTextBox"
101+
Width="64"
102+
Height="32" SelectedIndex="9" Margin="0,0,12,0" VerticalAlignment="Center">
103+
<ComboBoxItem Content="8" />
104+
<ComboBoxItem Content="9" />
105+
<ComboBoxItem Content="10" />
106+
<ComboBoxItem Content="10.5" />
107+
<ComboBoxItem Content="11" />
108+
<ComboBoxItem Content="12" />
109+
<ComboBoxItem Content="14" />
110+
<ComboBoxItem Content="16" />
111+
<ComboBoxItem Content="18" />
112+
<ComboBoxItem Content="20" />
113+
<ComboBoxItem Content="24" />
114+
<ComboBoxItem Content="28" />
115+
<ComboBoxItem Content="32" />
116+
<ComboBoxItem Content="36" />
117+
<ComboBoxItem Content="40" />
118+
<ComboBoxItem Content="44" />
119+
<ComboBoxItem Content="48" />
120+
<ComboBoxItem Content="48" />
121+
<ComboBoxItem Content="54" />
122+
<ComboBoxItem Content="60" />
123+
<ComboBoxItem Content="66" />
124+
<ComboBoxItem Content="72" />
125+
<ComboBoxItem Content="80" />
126+
<ComboBoxItem Content="88" />
127+
<ComboBoxItem Content="96" />
128+
</ComboBox>
107129

108130
</StackPanel>
109131
</StackPanel>

0 commit comments

Comments
 (0)