made buttons square and added hotkeys
This commit is contained in:
@@ -5,6 +5,7 @@
|
||||
Title="SharpCalculator"
|
||||
Icon="avares://SharpCalculator.Avalonia/assets/icon.ico"
|
||||
FontFamily="Consolas" FontSize="24"
|
||||
MinWidth="460" MinHeight="570"
|
||||
Width="460" Height="570">
|
||||
|
||||
<Grid Margin="10">
|
||||
@@ -14,7 +15,9 @@
|
||||
TextChanged="Input_OnTextChanged"
|
||||
BorderThickness="2"
|
||||
BorderBrush="#AAAAAA"
|
||||
TextWrapping="Wrap"/>
|
||||
TextWrapping="Wrap"
|
||||
ScrollViewer.HorizontalScrollBarVisibility="Disabled"
|
||||
ScrollViewer.VerticalScrollBarVisibility="Auto"/>
|
||||
|
||||
<TextBlock Grid.Row="1"
|
||||
VerticalAlignment="Center"
|
||||
@@ -26,7 +29,9 @@
|
||||
VerticalContentAlignment="Center"
|
||||
IsReadOnly="True"
|
||||
BorderThickness="0"
|
||||
TextWrapping="NoWrap"/>
|
||||
TextWrapping="NoWrap"
|
||||
ScrollViewer.HorizontalScrollBarVisibility="Auto"
|
||||
ScrollViewer.VerticalScrollBarVisibility="Disabled"/>
|
||||
|
||||
<TextBox Name="History" Grid.Row="2"
|
||||
Foreground="Gray"
|
||||
@@ -34,7 +39,9 @@
|
||||
BorderBrush="Gray"
|
||||
IsReadOnly="True"
|
||||
TextWrapping="NoWrap"
|
||||
FontSize="18"/>
|
||||
FontSize="18"
|
||||
ScrollViewer.HorizontalScrollBarVisibility="Auto"
|
||||
ScrollViewer.VerticalScrollBarVisibility="Auto"/>
|
||||
|
||||
<Grid Grid.Row="3" VerticalAlignment="Bottom"
|
||||
MinWidth="440" MaxWidth="440" MinHeight="320" MaxHeight="320">
|
||||
@@ -43,119 +50,119 @@
|
||||
|
||||
<!-- 1st row -->
|
||||
|
||||
<Button Classes="cirlce gray" Grid.Column="0" Grid.Row="0"
|
||||
<Button Classes="button gray" Grid.Column="0" Grid.Row="0"
|
||||
Click="ClearButton_OnClick" Content="AC"/>
|
||||
|
||||
<Button Classes="cirlce gray" Grid.Column="1" Grid.Row="0"
|
||||
<Button Classes="button gray" Grid.Column="1" Grid.Row="0"
|
||||
Click="MathButton_OnClick" Content="("/>
|
||||
|
||||
<Button Classes="cirlce gray" Grid.Column="2" Grid.Row="0"
|
||||
<Button Classes="button gray" Grid.Column="2" Grid.Row="0"
|
||||
Click="MathButton_OnClick" Content=")" />
|
||||
|
||||
<Button Classes="cirlce orange" Grid.Column="3" Grid.Row="0"
|
||||
<Button Classes="button orange" Grid.Column="3" Grid.Row="0"
|
||||
Click="MathButton_OnClick" Content="/"/>
|
||||
|
||||
<Button Classes="cirlce gray" Grid.Column="4" Grid.Row="0"
|
||||
<Button Classes="button gray" Grid.Column="4" Grid.Row="0"
|
||||
Click="MathButton_OnClick" Content="1/x"/>
|
||||
|
||||
<Button Classes="cirlce gray" Grid.Column="5" Grid.Row="0"
|
||||
<Button Classes="button gray" Grid.Column="5" Grid.Row="0"
|
||||
Click="MathButton_OnClick" Content="sin"/>
|
||||
|
||||
<Button Classes="cirlce gray" Grid.Column="6" Grid.Row="0"
|
||||
<Button Classes="button gray" Grid.Column="6" Grid.Row="0"
|
||||
Click="MathButton_OnClick" Content="asin"/>
|
||||
|
||||
<!-- 2nd row -->
|
||||
|
||||
<Button Classes="cirlce" Grid.Column="0" Grid.Row="1"
|
||||
<Button Classes="button" Grid.Column="0" Grid.Row="1"
|
||||
Click="MathButton_OnClick" Content="7"/>
|
||||
|
||||
<Button Classes="cirlce" Grid.Column="1" Grid.Row="1"
|
||||
<Button Classes="button" Grid.Column="1" Grid.Row="1"
|
||||
Click="MathButton_OnClick" Content="8"/>
|
||||
|
||||
<Button Classes="cirlce" Grid.Column="2" Grid.Row="1"
|
||||
<Button Classes="button" Grid.Column="2" Grid.Row="1"
|
||||
Click="MathButton_OnClick" Content="9"/>
|
||||
|
||||
<Button Classes="cirlce orange" Grid.Column="3" Grid.Row="1"
|
||||
<Button Classes="button orange" Grid.Column="3" Grid.Row="1"
|
||||
Click="MathButton_OnClick" Content="*"/>
|
||||
|
||||
<Button Classes="cirlce gray" Grid.Column="4" Grid.Row="1"
|
||||
<Button Classes="button gray" Grid.Column="4" Grid.Row="1"
|
||||
Click="MathButton_OnClick" Content="^"/>
|
||||
|
||||
<Button Classes="cirlce gray" Grid.Column="5" Grid.Row="1"
|
||||
<Button Classes="button gray" Grid.Column="5" Grid.Row="1"
|
||||
Click="MathButton_OnClick" Content="cos"/>
|
||||
|
||||
<Button Classes="cirlce gray" Grid.Column="6" Grid.Row="1"
|
||||
<Button Classes="button gray" Grid.Column="6" Grid.Row="1"
|
||||
Click="MathButton_OnClick" Content="acos"/>
|
||||
|
||||
<!-- 3th row -->
|
||||
|
||||
<Button Classes="cirlce" Grid.Column="0" Grid.Row="2"
|
||||
<Button Classes="button" Grid.Column="0" Grid.Row="2"
|
||||
Click="MathButton_OnClick" Content="4"/>
|
||||
|
||||
<Button Classes="cirlce" Grid.Column="1" Grid.Row="2"
|
||||
<Button Classes="button" Grid.Column="1" Grid.Row="2"
|
||||
Click="MathButton_OnClick" Content="5"/>
|
||||
|
||||
<Button Classes="cirlce" Grid.Column="2" Grid.Row="2"
|
||||
<Button Classes="button" Grid.Column="2" Grid.Row="2"
|
||||
Click="MathButton_OnClick" Content="6"/>
|
||||
|
||||
<Button Classes="cirlce orange" Grid.Column="3" Grid.Row="2"
|
||||
<Button Classes="button orange" Grid.Column="3" Grid.Row="2"
|
||||
Click="MathButton_OnClick" Content="-"/>
|
||||
|
||||
<Button Classes="cirlce gray" Grid.Column="4" Grid.Row="2"
|
||||
<Button Classes="button gray" Grid.Column="4" Grid.Row="2"
|
||||
FontSize="22"
|
||||
Click="MathButton_OnClick" Content="10^x"/>
|
||||
|
||||
<Button Classes="cirlce gray" Grid.Column="5" Grid.Row="2"
|
||||
<Button Classes="button gray" Grid.Column="5" Grid.Row="2"
|
||||
Click="MathButton_OnClick" Content="tg"/>
|
||||
|
||||
<Button Classes="cirlce gray" Grid.Column="6" Grid.Row="2"
|
||||
<Button Classes="button gray" Grid.Column="6" Grid.Row="2"
|
||||
Click="MathButton_OnClick" Content="atg"/>
|
||||
|
||||
<!-- 4th row -->
|
||||
|
||||
<Button Classes="cirlce" Grid.Column="0" Grid.Row="3"
|
||||
<Button Classes="button" Grid.Column="0" Grid.Row="3"
|
||||
Click="MathButton_OnClick" Content="1"/>
|
||||
|
||||
<Button Classes="cirlce" Grid.Column="1" Grid.Row="3"
|
||||
<Button Classes="button" Grid.Column="1" Grid.Row="3"
|
||||
Click="MathButton_OnClick" Content="2"/>
|
||||
|
||||
<Button Classes="cirlce" Grid.Column="2" Grid.Row="3"
|
||||
<Button Classes="button" Grid.Column="2" Grid.Row="3"
|
||||
Click="MathButton_OnClick" Content="3"/>
|
||||
|
||||
<Button Classes="cirlce orange" Grid.Column="3" Grid.Row="3"
|
||||
<Button Classes="button orange" Grid.Column="3" Grid.Row="3"
|
||||
Click="MathButton_OnClick" Content="+"/>
|
||||
|
||||
<Button Classes="cirlce gray" Grid.Column="4" Grid.Row="3"
|
||||
<Button Classes="button gray" Grid.Column="4" Grid.Row="3"
|
||||
Click="MathButton_OnClick" Content="e"/>
|
||||
|
||||
<Button Classes="cirlce gray" Grid.Column="5" Grid.Row="3"
|
||||
<Button Classes="button gray" Grid.Column="5" Grid.Row="3"
|
||||
Click="MathButton_OnClick" Content="ctg"/>
|
||||
|
||||
<Button Classes="cirlce gray" Grid.Column="6" Grid.Row="3"
|
||||
<Button Classes="button gray" Grid.Column="6" Grid.Row="3"
|
||||
Click="MathButton_OnClick" Content="actg"/>
|
||||
|
||||
<!-- 5th row -->
|
||||
|
||||
<Button Classes="cirlce" Grid.Column="0" Grid.Row="4"
|
||||
<Button Classes="button" Grid.Column="0" Grid.Row="4"
|
||||
Click="MathButton_OnClick" Content="0"/>
|
||||
|
||||
<Button Classes="cirlce" Grid.Column="1" Grid.Row="4"
|
||||
<Button Classes="button" Grid.Column="1" Grid.Row="4"
|
||||
Click="MathButton_OnClick" Content="."/>
|
||||
|
||||
<Button Classes="cirlce" Grid.Column="2" Grid.Row="4"
|
||||
<Button Classes="button" Grid.Column="2" Grid.Row="4"
|
||||
Click="MathButton_OnClick" Content="%"/>
|
||||
|
||||
<Button Classes="cirlce orange" Grid.Column="3" Grid.Row="4"
|
||||
<Button Classes="button orange" Grid.Column="3" Grid.Row="4"
|
||||
Click="ResultButton_OnClick" Content="="/>
|
||||
|
||||
<Button Classes="cirlce gray" Grid.Column="4" Grid.Row="4"
|
||||
<Button Classes="button gray" Grid.Column="4" Grid.Row="4"
|
||||
Click="MathButton_OnClick" Content="π"/>
|
||||
|
||||
<Button Classes="cirlce gray" Grid.Column="5" Grid.Row="4"
|
||||
<Button Classes="button gray" Grid.Column="5" Grid.Row="4"
|
||||
FontSize="22"
|
||||
Click="MathButton_OnClick" Content="rand"/>
|
||||
|
||||
<Button Classes="cirlce gray" Grid.Column="6" Grid.Row="4"
|
||||
<Button Classes="button gray" Grid.Column="6" Grid.Row="4"
|
||||
Click="MathButton_OnClick" Content="ln"/>
|
||||
</Grid>
|
||||
</Grid>
|
||||
|
||||
Reference in New Issue
Block a user