wagesj45/advanced-calculator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: wagesj45:9483bd01ebb62817bb61d36422f54822d13d36cb
Branches Tags
wagesj45:master
wagesj45:1.0
..
compare: wagesj45:a8b0aa71a7322fa88981c80298abaf3fdb15e710
Branches Tags
wagesj45:master
wagesj45:1.0

No commits in common. "9483bd01ebb62817bb61d36422f54822d13d36cb" and "a8b0aa71a7322fa88981c80298abaf3fdb15e710" have entirely different histories.
9483bd01eb ... a8b0aa71a7

1 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/AdvancedCalculator/Views/MainView.axaml
View file

@ -36,7 +36,7 @@
<Button x:DataType="vm:MainViewModel" <Button x:DataType="vm:MainViewModel"
DataContext="{Binding #Root.DataContext}" DataContext="{Binding #Root.DataContext}"
Command="{Binding InsertVariableCommand}" Command="{Binding InsertVariableCommand}"
CommandParameter="{Binding $parent[ListBoxItem].DataContext.FunctionName}" CommandParameter="{Binding $parent[ListBoxItem].DataContext}"
Background="Transparent" BorderThickness="0" Padding="8" MinHeight="44" Background="Transparent" BorderThickness="0" Padding="8" MinHeight="44"
AutomationProperties.Name="Insert variable"> AutomationProperties.Name="Insert variable">
<Grid ColumnDefinitions="Auto,*,Auto" <Grid ColumnDefinitions="Auto,*,Auto"
@ -120,7 +120,7 @@
<Button x:DataType="vm:MainViewModel" <Button x:DataType="vm:MainViewModel"
DataContext="{Binding #Root.DataContext}" DataContext="{Binding #Root.DataContext}"
Command="{Binding InsertFunctionCommand}" Command="{Binding InsertFunctionCommand}"
CommandParameter="{Binding $parent[ListBoxItem].DataContext.VariableName}" CommandParameter="{Binding $parent[ListBoxItem].DataContext}"
Background="Transparent" BorderThickness="0" Padding="8" MinHeight="44" Background="Transparent" BorderThickness="0" Padding="8" MinHeight="44"
AutomationProperties.Name="Insert function"> AutomationProperties.Name="Insert function">
<StackPanel Spacing="8" <StackPanel Spacing="8"
@ -153,13 +153,9 @@
<TextBlock FontFamily="{StaticResource MDI}" Text="{x:Static m:IconFont.Function}" /> <TextBlock FontFamily="{StaticResource MDI}" Text="{x:Static m:IconFont.Function}" />
</Button> </Button>
<TextBox Grid.Column="2" Text="{Binding InputText, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" MinHeight="44" <TextBox Grid.Column="2" Text="{Binding InputText, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" MinHeight="44"
AutomationProperties.Name="Expression input" AutomationProperties.Name="Expression input"
Watermark="Type an expression (e.g., 2 + 2)"> Watermark="Type an expression (e.g., 2 + 2)"/>
<InputElement.KeyBindings>
<KeyBinding Gesture="Enter" Command="{Binding SubmitCommand}" />
</InputElement.KeyBindings>
</TextBox>
<!-- Explicit evaluate button for touch --> <!-- Explicit evaluate button for touch -->
<Button Grid.Column="3" Command="{Binding SubmitCommand}" MinHeight="44" Padding="16,8" <Button Grid.Column="3" Command="{Binding SubmitCommand}" MinHeight="44" Padding="16,8"