DevWiki/calculator
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Edit fields are scalable for large fonts (#1401)

Browse Source 
* Edit fields are scalable for large fonts

* Retain the initial width of edit fields, but scale if needed
This commit is contained in:
Jack Rainy 2020-10-22 19:28:26 +03:00 committed by GitHub
parent c97f1c6430
commit 903b231b1f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/Calculator/Views/GraphingCalculator/EquationInputArea.xaml
View File

@ -162,14 +162,17 @@
<TextBox x:Name="MinTextBox" <TextBox x:Name="MinTextBox"
x:Uid="VariableMinTextBox" x:Uid="VariableMinTextBox"
Grid.Column="1" Grid.Column="1"
MaxWidth="18"
Padding="2,16,2,2" Padding="2,16,2,2"
Style="{StaticResource ThemedVariableTextBoxStyle}" Style="{StaticResource ThemedVariableTextBoxStyle}"
FontSize="11" FontSize="11"
GotFocus="TextBoxGotFocus" GotFocus="TextBoxGotFocus"
KeyDown="TextBoxKeyDown" KeyDown="TextBoxKeyDown"
LosingFocus="TextBoxLosingFocus" LosingFocus="TextBoxLosingFocus"
Text="{x:Bind Min, Mode=OneWay}"/> Text="{x:Bind Min, Mode=OneWay}">
<TextBox.Resources>
<x:Double x:Key="TextControlThemeMinWidth">18</x:Double>
</TextBox.Resources>
</TextBox>
</Grid> </Grid>
<Grid Grid.Column="1" HorizontalAlignment="Center"> <Grid Grid.Column="1" HorizontalAlignment="Center">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
@ -184,14 +187,17 @@
<TextBox x:Name="StepTextBox" <TextBox x:Name="StepTextBox"
x:Uid="VariableStepTextBox" x:Uid="VariableStepTextBox"
Grid.Column="1" Grid.Column="1"
MaxWidth="18"
Padding="2,16,2,2" Padding="2,16,2,2"
Style="{StaticResource ThemedVariableTextBoxStyle}" Style="{StaticResource ThemedVariableTextBoxStyle}"
FontSize="11" FontSize="11"
GotFocus="TextBoxGotFocus" GotFocus="TextBoxGotFocus"
KeyDown="TextBoxKeyDown" KeyDown="TextBoxKeyDown"
LosingFocus="TextBoxLosingFocus" LosingFocus="TextBoxLosingFocus"
Text="{x:Bind Step, Mode=OneWay}"/> Text="{x:Bind Step, Mode=OneWay}">
<TextBox.Resources>
<x:Double x:Key="TextControlThemeMinWidth">18</x:Double>
</TextBox.Resources>
</TextBox>
</Grid> </Grid>
<Grid Grid.Column="2" HorizontalAlignment="Right"> <Grid Grid.Column="2" HorizontalAlignment="Right">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
@ -205,14 +211,17 @@
<TextBox x:Name="MaxTextBox" <TextBox x:Name="MaxTextBox"
x:Uid="VariableMaxTextBox" x:Uid="VariableMaxTextBox"
Grid.Column="1" Grid.Column="1"
MaxWidth="18"
Padding="2,16,2,2" Padding="2,16,2,2"
Style="{StaticResource ThemedVariableTextBoxStyle}" Style="{StaticResource ThemedVariableTextBoxStyle}"
FontSize="11" FontSize="11"
GotFocus="TextBoxGotFocus" GotFocus="TextBoxGotFocus"
KeyDown="TextBoxKeyDown" KeyDown="TextBoxKeyDown"
LosingFocus="TextBoxLosingFocus" LosingFocus="TextBoxLosingFocus"
Text="{x:Bind Max, Mode=OneWay}"/> Text="{x:Bind Max, Mode=OneWay}">
<TextBox.Resources>
<x:Double x:Key="TextControlThemeMinWidth">18</x:Double>
</TextBox.Resources>
</TextBox>
</Grid> </Grid>
</Grid> </Grid>