releases/ClaudeDo
2
0
Fork 0
Code Issues 1 Pull Requests 2 Actions Packages Projects Releases 12 Wiki Activity

refactor(ui): migrate ConflictResolutionView to ModalShell and use dynamic resources

Browse Source 
Replace manual titlebar/drag handler with ModalShell, move action buttons to footer, convert StaticResource token attrs to DynamicResource, replace OrangeRed with BloodBrush, and use MonoFont DynamicResource.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
mika kuns
2026-05-30 16:50:38 +02:00
parent 229f865e7e
commit bce4e0a1e6
2 changed files with 32 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/ClaudeDo.Ui/Views/Planning/ConflictResolutionView.axaml.cs
View File

@@ -1,5 +1,4 @@
using Avalonia.Controls;
using Avalonia.Input;
using ClaudeDo.Ui.ViewModels.Planning;
namespace ClaudeDo.Ui.Views.Planning;
@@ -17,10 +16,4 @@ public partial class ConflictResolutionView : Window
if (DataContext is ConflictResolutionViewModel vm)
vm.CloseRequested = Close;
}
private void TitleBar_PointerPressed(object? sender, PointerPressedEventArgs e)
{
if (e.GetCurrentPoint(this).Properties.IsLeftButtonPressed)
BeginMoveDrag(e);
}
}