From 5702fd6c985add259f48df056a59d710f8446bfa Mon Sep 17 00:00:00 2001
From: Codex CLI <codex@example.com>
Date: Thu, 28 Aug 2025 00:22:11 -0500
Subject: [PATCH] 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.

---
 src/AdvancedCalculator/Views/MainView.axaml | 127 +++++++-------------
 1 file changed, 42 insertions(+), 85 deletions(-)

diff --git a/src/AdvancedCalculator/Views/MainView.axaml b/src/AdvancedCalculator/Views/MainView.axaml
index 21f52f6..dbdde55 100644
--- a/src/AdvancedCalculator/Views/MainView.axaml
+++ b/src/AdvancedCalculator/Views/MainView.axaml
@@ -75,92 +75,49 @@
                          AutomationProperties.Name="History list">
                         <ListBox.ItemTemplate>
                             <DataTemplate x:DataType="m:HistoryItem">
-                                <!-- Root row container so we can bind IsPointerOver for hover-only controls -->
-                                <Grid x:Name="HistoryRow" ColumnDefinitions="Auto,*,Auto" Margin="4,2">
-                                    <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>
+                                <!-- Make the entire row a single Button so the whole item is clickable -->
+                                <Button x:DataType="vm:MainViewModel"
+                                        DataContext="{Binding #Root.DataContext}"
+                                        Command="{Binding CopyHistoryOutputCommand}"
+                                        CommandParameter="{Binding $parent[ListBoxItem].DataContext}"
+                                        Background="Transparent"
+                                        BorderThickness="0"
+                                        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 -->
-                                    <Button Grid.Column="2" Panel.ZIndex="1"
-                                            IsVisible="{Binding #HistoryRow.IsPointerOver}"
-                                            Margin="8,0,0,0"
-                                            Padding="8,4"
-                                            MinHeight="28"
-                                            Background="Transparent"
-                                            AutomationProperties.Name="Copy options">
-                                        <Button.Flyout>
-                                            <Flyout Placement="BottomEdgeAlignedRight">
-                                                <StackPanel>
-                                                    <Button x:DataType="vm:MainViewModel"
-                                                            DataContext="{Binding #Root.DataContext}"
-                                                            Command="{Binding CopyHistoryInputCommand}"
-                                                            CommandParameter="{Binding #HistoryRow.DataContext}"
-                                                            AutomationProperties.Name="Copy input"
-                                                            Background="Transparent" BorderThickness="0" Padding="8,4">
-                                                        <TextBlock Text="Copy Input"/>
-                                                    </Button>
-                                                    <Button x:DataType="vm:MainViewModel"
-                                                            DataContext="{Binding #Root.DataContext}"
-                                                            Command="{Binding CopyHistoryOutputCommand}"
-                                                            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>
+                                        <!-- 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>
+                                </Button>
                             </DataTemplate>
                         </ListBox.ItemTemplate>
                     </ListBox>