Delete key does discard/delete

tryashtar · Aug 22, 2022 · 5a84644 · 5a84644
1 parent 13a8bee
commit 5a84644
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 2 deletions.
diff --git a/ImageMap4/Controls/MapList.xaml b/ImageMap4/Controls/MapList.xaml
@@ -9,7 +9,8 @@
              mc:Ignorable="d"
              d:DesignHeight="450"
              d:DesignWidth="800"
-             Focusable="True">
+             Focusable="True"
+             MouseDown="List_MouseDown">
     <UserControl.InputBindings>
         <KeyBinding Modifiers="Ctrl"
                     Key="A"

diff --git a/ImageMap4/Controls/MapList.xaml.cs b/ImageMap4/Controls/MapList.xaml.cs
@@ -60,6 +60,7 @@ public MapList()
     private Selectable<Map>? LastClicked;
     private void Map_MouseDown(object sender, MouseButtonEventArgs e)
     {
+        this.Focus();
         var map = (Selectable<Map>)((FrameworkElement)sender).DataContext;
         if (e.RightButton == MouseButtonState.Pressed)
         {
@@ -89,6 +90,11 @@ private void Map_MouseDown(object sender, MouseButtonEventArgs e)
         }
         LastClicked = map;
     }
+
+    private void List_MouseDown(object sender, MouseButtonEventArgs e)
+    {
+        this.Focus();
+    }
 }
 
 public class Selectable<T> : ObservableObject

diff --git a/ImageMap4/MainWindow.xaml b/ImageMap4/MainWindow.xaml
@@ -25,6 +25,8 @@
         <KeyBinding Modifiers="Ctrl+Shift"
                     Key="Z"
                     Command="{Binding RedoCommand}" />
+        <KeyBinding Key="Delete"
+                    Command="{Binding DeleteCommand, RelativeSource={RelativeSource AncestorType=Window}}" />
     </Window.InputBindings>
     <Window.Resources>
         <ResourceDictionary>
@@ -501,7 +503,8 @@
                         </Button>
                     </StackPanel>
                 </StackPanel>
-                <local:MapList Grid.Column="1"
+                <local:MapList x:Name="ExistingList"
+                               Grid.Column="1"
                                Grid.Row="1"
                                DataContext="{Binding ExistingMapsView}"
                                MapMenu="{StaticResource ExistingMenu}">

diff --git a/ImageMap4/MainWindow.xaml.cs b/ImageMap4/MainWindow.xaml.cs
@@ -29,6 +29,7 @@ public partial class MainWindow : Window, IDropTarget
 {
     private MainViewModel ViewModel => (MainViewModel)this.DataContext;
     public ICommand PasteCommand { get; }
+    public ICommand DeleteCommand { get; }
     public ICommand OpenWorldFolderCommand { get; }
     public ICommand OpenMapFileCommand { get; }
     public ICommand ChangeIDCommand { get; }
@@ -101,6 +102,13 @@ public MainWindow()
                 ImageWindow.Activate();
             }
         });
+        DeleteCommand = new RelayCommand(() =>
+        {
+            if (ImportList.IsFocused)
+                ViewModel.DiscardCommand.Execute(ViewModel.ImportingMaps);
+            else if (ExistingList.IsFocused)
+                ViewModel.DeleteCommand.Execute(ViewModel.ExistingMaps);
+        });
         InitializeComponent();
     }