refactor: 'Breakpoint here' commands CanExecute

Signed-off-by: Maximilien Noal <noal.maximilien@gmail.com>
OpenRakis · Nov 7, 2024 · b2960e3 · b2960e3
1 parent 91593a9
commit b2960e3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/Spice86/ViewModels/DisassemblyViewModel.cs b/src/Spice86/ViewModels/DisassemblyViewModel.cs
@@ -270,8 +270,11 @@ private void MoveCsIpHere() {
             UpdateDisassemblyCommand.Execute(null);
         }
     }
-
-    [RelayCommand]
+
+    private bool RemoveExecutionBreakpointHereCanExecute() =>
+        SelectedInstruction is not null && _breakpointsViewModel.HasUserExecutionBreakpoint(SelectedInstruction);
+
+    [RelayCommand(CanExecute = nameof(RemoveExecutionBreakpointHereCanExecute))]
     private void RemoveExecutionBreakpointHere() {
         if (SelectedInstruction is null) {
             return;
@@ -280,7 +283,10 @@ private void RemoveExecutionBreakpointHere() {
         SelectedInstruction.HasBreakpoint = _breakpointsViewModel.HasUserExecutionBreakpoint(SelectedInstruction);
     }
 
-    [RelayCommand]
+    private bool CreateExecutionBreakpointHereCanExecute() =>
+        SelectedInstruction is not null && !_breakpointsViewModel.HasUserExecutionBreakpoint(SelectedInstruction);
+
+    [RelayCommand(CanExecute = nameof(CreateExecutionBreakpointHereCanExecute))]
     private void CreateExecutionBreakpointHere() {
         if (SelectedInstruction is null) {
             return;

diff --git a/src/Spice86/Views/DisassemblyView.axaml b/src/Spice86/Views/DisassemblyView.axaml
@@ -90,8 +90,8 @@
 			<DataGrid.ContextMenu>
 				<ContextMenu>
 					<MenuItem Header="Copy line" Command="{Binding CopyLineCommand}" />
-					<MenuItem Header="Create address Breakpoint here" Command="{Binding CreateExecutionBreakpointHereCommand}" />
-					<MenuItem Header="Remove address BreakPoint here" Command="{Binding RemoveExecutionBreakpointHereCommand}" />
+					<MenuItem Header="Create execution breakpoint here" Command="{Binding CreateExecutionBreakpointHereCommand}" />
+					<MenuItem Header="Remove execution breakPoint here" Command="{Binding RemoveExecutionBreakpointHereCommand}" />
 					<MenuItem Header="Move CS:IP here" Command="{Binding MoveCsIpHereCommand}" />
 				</ContextMenu>
 			</DataGrid.ContextMenu>