Fix rename hijacking keyboard and close rename when clicking Esc

Ruben2776 · Jan 2, 2025 · 5186943 · 5186943
1 parent 54bce0d
commit 5186943
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/src/PicView.Avalonia/Views/MainView.axaml.cs b/src/PicView.Avalonia/Views/MainView.axaml.cs
@@ -69,13 +69,18 @@ private void CloseTitlebarIfOpen(object? sender, EventArgs e)
         {
             return;
         }
-        if (vm.IsEditableTitlebarOpen)
+
+        if (!vm.IsEditableTitlebarOpen)
         {
-            vm.IsEditableTitlebarOpen = false;
+            return;
         }
+
+        vm.IsEditableTitlebarOpen = false;
+        MainKeyboardShortcuts.IsKeysEnabled = true;
+        Focus();
     }
 
-    private void HandleLostFocus(object? sender, EventArgs e)
+    private static void HandleLostFocus(object? sender, EventArgs e)
     {
         DragAndDropHelper.RemoveDragDropView();
     }

diff --git a/src/PicView.Avalonia/Views/UC/EditableTitlebar.axaml.cs b/src/PicView.Avalonia/Views/UC/EditableTitlebar.axaml.cs
@@ -20,6 +20,7 @@ public EditableTitlebar()
         LostFocus += OnLostFocus;
         PointerEntered += OnPointerEntered;
         PointerPressed += OnPointerPressed;
+        TextBox.LostFocus += OnLostFocus;
     }
 
     private void OnPointerPressed(object? sender, PointerPressedEventArgs e)
@@ -78,6 +79,20 @@ public void CloseTitlebar()
 
     protected override void OnKeyDown(KeyEventArgs e)
     {
+        if (DataContext is not MainViewModel vm)
+        {
+            return;
+        }
+
+        if (!vm.IsEditableTitlebarOpen)
+        {
+            return;
+        }
+
+        if (e.Key is Key.Escape)
+        {
+            CloseTitlebar();
+        }
         MainKeyboardShortcuts.IsKeysEnabled = false;
         base.OnKeyDown(e);
     }