From 8d07fc298c7324312bc004ffde18d9a661a73dff Mon Sep 17 00:00:00 2001
From: mika kuns <mika.kuns@fb-tuning.de>
Date: Sat, 30 May 2026 16:44:04 +0200
Subject: [PATCH] refactor(ui): migrate MergeModal to ModalShell

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../Views/Modals/MergeModalView.axaml         | 178 +++++++-----------
 .../Views/Modals/MergeModalView.axaml.cs      |   7 +-
 2 files changed, 68 insertions(+), 117 deletions(-)

diff --git a/src/ClaudeDo.Ui/Views/Modals/MergeModalView.axaml b/src/ClaudeDo.Ui/Views/Modals/MergeModalView.axaml
index 4acbd6d..fdcb9ac 100644
--- a/src/ClaudeDo.Ui/Views/Modals/MergeModalView.axaml
+++ b/src/ClaudeDo.Ui/Views/Modals/MergeModalView.axaml
@@ -1,6 +1,7 @@
 <Window xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:vm="clr-namespace:ClaudeDo.Ui.ViewModels.Modals"
+        xmlns:ctl="using:ClaudeDo.Ui.Views.Controls"
         x:Class="ClaudeDo.Ui.Views.Modals.MergeModalView"
         x:DataType="vm:MergeModalViewModel"
         Title="Merge worktree"
@@ -15,124 +16,79 @@
     <KeyBinding Gesture="Escape" Command="{Binding CancelCommand}"/>
   </Window.KeyBindings>
 
-  <Window.Styles>
-    <Style Selector="TextBlock.field-label">
-      <Setter Property="FontSize" Value="11"/>
-      <Setter Property="Foreground" Value="{DynamicResource TextDimBrush}"/>
-      <Setter Property="Margin" Value="0,0,0,4"/>
-    </Style>
-    <Style Selector="Button.primary">
-      <Setter Property="Background" Value="{DynamicResource AccentBrush}"/>
-      <Setter Property="Foreground" Value="{DynamicResource DeepBrush}"/>
-      <Setter Property="FontWeight" Value="SemiBold"/>
-    </Style>
-  </Window.Styles>
+  <ctl:ModalShell Title="MERGE WORKTREE" CloseCommand="{Binding CancelCommand}">
+    <ctl:ModalShell.Footer>
+      <StackPanel Orientation="Horizontal" Spacing="8"
+                  HorizontalAlignment="Right" VerticalAlignment="Center"
+                  Margin="16,0">
+        <Button Content="Cancel" Command="{Binding CancelCommand}" MinWidth="90"/>
+        <Button Content="Merge" Classes="primary"
+                Command="{Binding SubmitCommand}"
+                IsDefault="True" MinWidth="90"/>
+      </StackPanel>
+    </ctl:ModalShell.Footer>
 
-  <Border Background="{DynamicResource SurfaceBrush}"
-          BorderBrush="{DynamicResource LineBrush}"
-          BorderThickness="1">
-    <Grid RowDefinitions="36,*,52">
+    <!-- Body -->
+    <ScrollViewer Padding="20,16">
+      <StackPanel Spacing="12">
 
-      <!-- Title bar -->
-      <Border Grid.Row="0"
-              x:Name="TitleBar"
-              Background="{DynamicResource DeepBrush}"
-              BorderBrush="{DynamicResource LineBrush}"
-              BorderThickness="0,0,0,1"
-              PointerPressed="TitleBar_PointerPressed">
-        <Grid ColumnDefinitions="*,Auto" Margin="14,0">
-          <TextBlock Text="MERGE WORKTREE"
-                     FontFamily="{DynamicResource MonoFont}"
-                     FontSize="11"
-                     LetterSpacing="1.4"
-                     Foreground="{DynamicResource TextBrush}"
-                     VerticalAlignment="Center"/>
-          <Button Grid.Column="1"
-                  Classes="icon-btn"
-                  Content="✕"
-                  FontSize="12"
-                  Command="{Binding CancelCommand}"
-                  VerticalAlignment="Center"/>
-        </Grid>
-      </Border>
+        <TextBlock Text="{Binding TaskTitle, StringFormat='Merging: {0}'}"
+                   FontWeight="SemiBold"
+                   Foreground="{DynamicResource TextBrush}" />
 
-      <!-- Body -->
-      <ScrollViewer Grid.Row="1" Padding="20,16">
-        <StackPanel Spacing="12">
-
-          <TextBlock Text="{Binding TaskTitle, StringFormat='Merging: {0}'}"
-                     FontWeight="SemiBold"
-                     Foreground="{DynamicResource TextBrush}" />
-
-          <StackPanel Spacing="4">
-            <TextBlock Classes="field-label" Text="Target branch"/>
-            <ComboBox ItemsSource="{Binding Branches}"
-                      SelectedItem="{Binding SelectedBranch}"
-                      HorizontalAlignment="Stretch"
-                      IsEnabled="{Binding !IsBusy}" />
-          </StackPanel>
-
-          <CheckBox Content="Remove worktree after merge"
-                    IsChecked="{Binding RemoveWorktree}"
+        <StackPanel Spacing="4">
+          <TextBlock Classes="field-label" Text="Target branch"/>
+          <ComboBox ItemsSource="{Binding Branches}"
+                    SelectedItem="{Binding SelectedBranch}"
+                    HorizontalAlignment="Stretch"
                     IsEnabled="{Binding !IsBusy}" />
+        </StackPanel>
 
+        <CheckBox Content="Remove worktree after merge"
+                  IsChecked="{Binding RemoveWorktree}"
+                  IsEnabled="{Binding !IsBusy}" />
+
+        <StackPanel Spacing="4">
+          <TextBlock Classes="field-label" Text="Commit message"/>
+          <TextBox Text="{Binding CommitMessage}"
+                   AcceptsReturn="True"
+                   TextWrapping="Wrap"
+                   Height="70"
+                   IsEnabled="{Binding !IsBusy}" />
+        </StackPanel>
+
+        <TextBlock Text="{Binding ErrorMessage}"
+                   Foreground="{DynamicResource BloodBrush}"
+                   TextWrapping="Wrap"
+                   IsVisible="{Binding ErrorMessage, Converter={x:Static ObjectConverters.IsNotNull}}" />
+
+        <Border BorderBrush="{DynamicResource BloodBrush}"
+                BorderThickness="1"
+                CornerRadius="6"
+                Padding="12,10"
+                IsVisible="{Binding HasConflict}">
           <StackPanel Spacing="4">
-            <TextBlock Classes="field-label" Text="Commit message"/>
-            <TextBox Text="{Binding CommitMessage}"
-                     AcceptsReturn="True"
-                     TextWrapping="Wrap"
-                     Height="70"
-                     IsEnabled="{Binding !IsBusy}" />
+            <TextBlock Text="Conflicted files:"
+                       FontWeight="SemiBold"
+                       Foreground="{DynamicResource TextBrush}" />
+            <ItemsControl ItemsSource="{Binding ConflictFiles}">
+              <ItemsControl.ItemTemplate>
+                <DataTemplate>
+                  <TextBlock Text="{Binding}"
+                             FontFamily="{DynamicResource MonoFont}"
+                             FontSize="{StaticResource FontSizeMono}"
+                             Foreground="{DynamicResource TextDimBrush}" />
+                </DataTemplate>
+              </ItemsControl.ItemTemplate>
+            </ItemsControl>
           </StackPanel>
+        </Border>
 
-          <TextBlock Text="{Binding ErrorMessage}"
-                     Foreground="{DynamicResource BloodBrush}"
-                     TextWrapping="Wrap"
-                     IsVisible="{Binding ErrorMessage, Converter={x:Static ObjectConverters.IsNotNull}}" />
+        <TextBlock Text="{Binding SuccessMessage}"
+                   Foreground="{DynamicResource MossBrightBrush}"
+                   IsVisible="{Binding SuccessMessage, Converter={x:Static ObjectConverters.IsNotNull}}" />
+      </StackPanel>
+    </ScrollViewer>
 
-          <Border BorderBrush="{DynamicResource BloodBrush}"
-                  BorderThickness="1"
-                  CornerRadius="6"
-                  Padding="12,10"
-                  IsVisible="{Binding HasConflict}">
-            <StackPanel Spacing="4">
-              <TextBlock Text="Conflicted files:"
-                         FontWeight="SemiBold"
-                         Foreground="{DynamicResource TextBrush}" />
-              <ItemsControl ItemsSource="{Binding ConflictFiles}">
-                <ItemsControl.ItemTemplate>
-                  <DataTemplate>
-                    <TextBlock Text="{Binding}"
-                               FontFamily="{DynamicResource MonoFont}"
-                               FontSize="11"
-                               Foreground="{DynamicResource TextDimBrush}" />
-                  </DataTemplate>
-                </ItemsControl.ItemTemplate>
-              </ItemsControl>
-            </StackPanel>
-          </Border>
-
-          <TextBlock Text="{Binding SuccessMessage}"
-                     Foreground="{DynamicResource MossBrightBrush}"
-                     IsVisible="{Binding SuccessMessage, Converter={x:Static ObjectConverters.IsNotNull}}" />
-        </StackPanel>
-      </ScrollViewer>
-
-      <!-- Footer -->
-      <Border Grid.Row="2"
-              Background="{DynamicResource DeepBrush}"
-              BorderBrush="{DynamicResource LineBrush}"
-              BorderThickness="0,1,0,0">
-        <StackPanel Orientation="Horizontal" Spacing="8"
-                    HorizontalAlignment="Right" VerticalAlignment="Center"
-                    Margin="16,0">
-          <Button Content="Cancel" Command="{Binding CancelCommand}" MinWidth="90"/>
-          <Button Content="Merge" Classes="primary"
-                  Command="{Binding SubmitCommand}"
-                  IsDefault="True" MinWidth="90"/>
-        </StackPanel>
-      </Border>
-
-    </Grid>
-  </Border>
+  </ctl:ModalShell>
 </Window>
diff --git a/src/ClaudeDo.Ui/Views/Modals/MergeModalView.axaml.cs b/src/ClaudeDo.Ui/Views/Modals/MergeModalView.axaml.cs
index ada6471..c52fcb2 100644
--- a/src/ClaudeDo.Ui/Views/Modals/MergeModalView.axaml.cs
+++ b/src/ClaudeDo.Ui/Views/Modals/MergeModalView.axaml.cs
@@ -1,5 +1,4 @@
 using Avalonia.Controls;
-using Avalonia.Input;
 using ClaudeDo.Ui.ViewModels.Modals;
 
 namespace ClaudeDo.Ui.Views.Modals;
@@ -18,9 +17,5 @@ public partial class MergeModalView : Window
         };
     }
 
-    private void TitleBar_PointerPressed(object? sender, PointerPressedEventArgs e)
-    {
-        if (e.GetCurrentPoint(this).Properties.IsLeftButtonPressed)
-            BeginMoveDrag(e);
-    }
+
 }