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

Refactor history item: wrap row Grid in a single Button so the entire list item is the copy target; keep advanced copy actions via context menu.

Browse source
This commit is contained in:
Codex CLI 2025-08-28 00:22:11 -05:00
commit 5702fd6c98
1 changed files with 42 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -75,92 +75,49 @@
AutomationProperties.Name="History list"> AutomationProperties.Name="History list">
<ListBox.ItemTemplate> <ListBox.ItemTemplate>
<DataTemplate x:DataType="m:HistoryItem"> <DataTemplate x:DataType="m:HistoryItem">
<!-- Root row container so we can bind IsPointerOver for hover-only controls --> <!-- Make the entire row a single Button so the whole item is clickable -->
<Grid x:Name="HistoryRow" ColumnDefinitions="Auto,*,Auto" Margin="4,2"> <Button x:DataType="vm:MainViewModel"
<TextBlock Grid.Column="0" FontFamily="{StaticResource MDI}" Text="{x:Static m:IconFont.ArrowRightDropCircle}" DataContext="{Binding #Root.DataContext}"
FontSize="{DynamicResource IconSizeM}" VerticalAlignment="Center" Margin="0,0,8,0" /> Command="{Binding CopyHistoryOutputCommand}"
<StackPanel Grid.Column="1"> CommandParameter="{Binding $parent[ListBoxItem].DataContext}"
<TextBlock Text="{Binding Input}" MaxLines="3" /> Background="Transparent"
<TextBlock Text="{Binding Output}" FontWeight="Bold" MaxLines="2" /> BorderThickness="0"
</StackPanel> Padding="0"
MinHeight="40"
AutomationProperties.Name="Copy history item">
<Grid x:Name="HistoryRow" ColumnDefinitions="Auto,*,Auto" Margin="4,2"
DataContext="{Binding $parent[ListBoxItem].DataContext}"
x:DataType="m:HistoryItem">
<TextBlock Grid.Column="0" FontFamily="{StaticResource MDI}" Text="{x:Static m:IconFont.ArrowRightDropCircle}"
FontSize="{DynamicResource IconSizeM}"
VerticalAlignment="Center" Margin="0,0,8,0" />
<StackPanel Grid.Column="1">
<TextBlock Text="{Binding Input}" MaxLines="3" />
<TextBlock Text="{Binding Output}" FontWeight="Bold" MaxLines="2" />
</StackPanel>
<!-- Hover-only copy button for Desktop/Web with options flyout --> <!-- Context menu for right-click / long-press (Android) -->
<Button Grid.Column="2" Panel.ZIndex="1" <Grid.ContextMenu>
IsVisible="{Binding #HistoryRow.IsPointerOver}" <ContextMenu>
Margin="8,0,0,0" <MenuItem x:DataType="vm:MainViewModel"
Padding="8,4" DataContext="{Binding #Root.DataContext}"
MinHeight="28" Header="Copy Input"
Background="Transparent" Command="{Binding CopyHistoryInputCommand}"
AutomationProperties.Name="Copy options"> CommandParameter="{Binding #HistoryRow.DataContext}" />
<Button.Flyout> <MenuItem x:DataType="vm:MainViewModel"
<Flyout Placement="BottomEdgeAlignedRight"> DataContext="{Binding #Root.DataContext}"
<StackPanel> Header="Copy Output"
<Button x:DataType="vm:MainViewModel" Command="{Binding CopyHistoryOutputCommand}"
DataContext="{Binding #Root.DataContext}" CommandParameter="{Binding #HistoryRow.DataContext}" />
Command="{Binding CopyHistoryInputCommand}" <MenuItem x:DataType="vm:MainViewModel"
CommandParameter="{Binding #HistoryRow.DataContext}" DataContext="{Binding #Root.DataContext}"
AutomationProperties.Name="Copy input" Header="Copy Input = Output"
Background="Transparent" BorderThickness="0" Padding="8,4"> Command="{Binding CopyHistoryBothCommand}"
<TextBlock Text="Copy Input"/> CommandParameter="{Binding #HistoryRow.DataContext}" />
</Button> </ContextMenu>
<Button x:DataType="vm:MainViewModel" </Grid.ContextMenu>
DataContext="{Binding #Root.DataContext}" </Grid>
Command="{Binding CopyHistoryOutputCommand}" </Button>
CommandParameter="{Binding #HistoryRow.DataContext}"
AutomationProperties.Name="Copy output"
Background="Transparent" BorderThickness="0" Padding="8,4">
<TextBlock Text="Copy Output"/>
</Button>
<Button x:DataType="vm:MainViewModel"
DataContext="{Binding #Root.DataContext}"
Command="{Binding CopyHistoryBothCommand}"
CommandParameter="{Binding #HistoryRow.DataContext}"
AutomationProperties.Name="Copy input and output"
Background="Transparent" BorderThickness="0" Padding="8,4">
<TextBlock Text="Copy Input = Output"/>
</Button>
</StackPanel>
</Flyout>
</Button.Flyout>
<TextBlock Text="Copy"/>
</Button>
<!-- Full-row overlay click target (pure XAML/MVVM).
Sits on top of icon + text (columns 0-1) and triggers copy of output. -->
<Button Grid.ColumnSpan="3" Panel.ZIndex="0"
Background="Transparent"
BorderThickness="0"
Focusable="False"
Cursor="Hand"
x:DataType="vm:MainViewModel"
DataContext="{Binding #Root.DataContext}"
Command="{Binding CopyHistoryOutputCommand}"
CommandParameter="{Binding #HistoryRow.DataContext}" />
<!-- Context menu for right-click / long-press (Android) -->
<Grid.ContextMenu>
<ContextMenu>
<MenuItem x:DataType="vm:MainViewModel"
DataContext="{Binding #Root.DataContext}"
Header="Copy Input"
Command="{Binding CopyHistoryInputCommand}"
CommandParameter="{Binding #HistoryRow.DataContext}"
/>
<MenuItem x:DataType="vm:MainViewModel"
DataContext="{Binding #Root.DataContext}"
Header="Copy Output"
Command="{Binding CopyHistoryOutputCommand}"
CommandParameter="{Binding #HistoryRow.DataContext}"
/>
<MenuItem x:DataType="vm:MainViewModel"
DataContext="{Binding #Root.DataContext}"
Header="Copy Input = Output"
Command="{Binding CopyHistoryBothCommand}"
CommandParameter="{Binding #HistoryRow.DataContext}"
/>
</ContextMenu>
</Grid.ContextMenu>
</Grid>
</DataTemplate> </DataTemplate>
</ListBox.ItemTemplate> </ListBox.ItemTemplate>
</ListBox> </ListBox>