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

Borked :(

Browse source
This commit is contained in:
Jordan Wages 2025-08-27 04:18:47 -05:00
commit 6fe6db48a6
1 changed files with 143 additions and 143 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -38,24 +38,23 @@
<ListBox.ItemTemplate> <ListBox.ItemTemplate>
<DataTemplate x:DataType="m:VariableItem"> <DataTemplate x:DataType="m:VariableItem">
<Button Background="Transparent" BorderThickness="0" Padding="8" MinHeight="44" <Button Background="Transparent" BorderThickness="0" Padding="8" MinHeight="44"
x:DataType="vm:MainViewModel"
DataContext="{Binding $parent[UserControl].DataContext}"
AutomationProperties.Name="Insert variable" AutomationProperties.Name="Insert variable"
Command="{Binding InsertVariableCommand}" Command="{Binding #Root.DataContext.InsertVariableCommand}"
CommandParameter="{Binding DataContext.VariableName, RelativeSource={RelativeSource AncestorType=ListBoxItem}}"> CommandParameter="{Binding VariableName}">
<Grid ColumnDefinitions="Auto,*,Auto" <Grid ColumnDefinitions="Auto,*,Auto"
DataContext="{Binding $parent[ListBoxItem].DataContext}" DataContext="{Binding $parent[ListBoxItem].DataContext}"
x:DataType="m:VariableItem"> x:DataType="m:VariableItem">
<TextBlock Grid.Column="0" FontFamily="{StaticResource MDI}" <TextBlock Grid.Column="0" FontFamily="{StaticResource MDI}"
FontSize="{DynamicResource IconSizeM}" Text="{Binding Icon}" VerticalAlignment="Center" Margin="0,0,8,0" /> FontSize="{DynamicResource IconSizeM}" Text="{Binding Icon}" Margin="0,0,8,0" />
<TextBlock Grid.Column="1" Text="{Binding VariableName}" FontWeight="Bold" VerticalAlignment="Center" /> <TextBlock Grid.Column="1" Text="{Binding VariableName}" FontWeight="Bold" />
<StackPanel Grid.Column="2" Spacing="6" VerticalAlignment="Center"> <StackPanel Grid.Column="2" Spacing="6">
<TextBlock Text="{Binding Value}" /> <TextBlock Text="{Binding Value}" />
<TextBlock IsVisible="{Binding IsExpression}" Text="{Binding ExpressionComputation}" FontStyle="Italic" /> <TextBlock IsVisible="{Binding IsExpression}" Text="{Binding ExpressionComputation}" FontStyle="Italic" />
</StackPanel> </StackPanel>
</Grid> </Grid>
</Button> </Button>
</DataTemplate> </DataTemplate>
</ListBox.ItemTemplate> </ListBox.ItemTemplate>
</ListBox> </ListBox>
<TextBlock Text="No variables yet. Define with: x = 5" <TextBlock Text="No variables yet. Define with: x = 5"
@ -71,16 +70,16 @@
AutomationProperties.Name="Functions list"> AutomationProperties.Name="Functions list">
<ListBox.ItemTemplate> <ListBox.ItemTemplate>
<DataTemplate x:DataType="m:FunctionDefinitionItem"> <DataTemplate x:DataType="m:FunctionDefinitionItem">
<Button Background="Transparent" BorderThickness="0" Padding="8" MinHeight="44" <Button x:DataType="vm:MainViewModel"
x:DataType="vm:MainViewModel" DataContext="{Binding #Root.DataContext}"
DataContext="{Binding $parent[UserControl].DataContext}" Background="Transparent" BorderThickness="0" Padding="8" MinHeight="44"
AutomationProperties.Name="Insert function" AutomationProperties.Name="Insert function"
Command="{Binding InsertFunctionCommand}" Command="{Binding InsertFunctionCommand}"
CommandParameter="{Binding DataContext.FunctionName, RelativeSource={RelativeSource AncestorType=ListBoxItem}}"> CommandParameter="{Binding FunctionName, RelativeSource={RelativeSource AncestorType=ListBoxItem}}">
<StackPanel Spacing="8" <StackPanel Spacing="8"
DataContext="{Binding $parent[ListBoxItem].DataContext}" DataContext="{Binding $parent[ListBoxItem].DataContext}"
x:DataType="m:FunctionDefinitionItem"> x:DataType="m:FunctionDefinitionItem">
<StackPanel Orientation="Horizontal" Spacing="8" VerticalAlignment="Center"> <StackPanel Orientation="Horizontal" Spacing="8">
<TextBlock FontFamily="{StaticResource MDI}" Text="{Binding Icon}" /> <TextBlock FontFamily="{StaticResource MDI}" Text="{Binding Icon}" />
<TextBlock Text="{Binding FunctionName}" FontWeight="Bold" /> <TextBlock Text="{Binding FunctionName}" FontWeight="Bold" />
</StackPanel> </StackPanel>
@ -98,6 +97,7 @@
</StackPanel> </StackPanel>
</Button> </Button>
</DataTemplate> </DataTemplate>
</ListBox.ItemTemplate> </ListBox.ItemTemplate>
</ListBox> </ListBox>
</Grid> </Grid>