bc788e1e0f
Opens a modal when PlanningMergeConflict fires, listing conflicted files with options to open in VS Code, continue, or abort the merge. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
27 lines
668 B
C#
27 lines
668 B
C#
using Avalonia.Controls;
|
|
using Avalonia.Input;
|
|
using ClaudeDo.Ui.ViewModels.Planning;
|
|
|
|
namespace ClaudeDo.Ui.Views.Planning;
|
|
|
|
public partial class ConflictResolutionView : Window
|
|
{
|
|
public ConflictResolutionView()
|
|
{
|
|
InitializeComponent();
|
|
}
|
|
|
|
protected override void OnDataContextChanged(EventArgs e)
|
|
{
|
|
base.OnDataContextChanged(e);
|
|
if (DataContext is ConflictResolutionViewModel vm)
|
|
vm.CloseRequested = Close;
|
|
}
|
|
|
|
private void TitleBar_PointerPressed(object? sender, PointerPressedEventArgs e)
|
|
{
|
|
if (e.GetCurrentPoint(this).Properties.IsLeftButtonPressed)
|
|
BeginMoveDrag(e);
|
|
}
|
|
}
|