From 4b13b75617418ad066ad9ab82b3e67e4fd8be0c4 Mon Sep 17 00:00:00 2001
From: miruka <miruka@disroot.org>
Date: Thu, 12 Dec 2019 08:39:26 -0400
Subject: [PATCH] Restore previous focus after HPopup closed

---
 src/qml/Base/HPopup.qml  | 5 +++++
 src/qml/DebugConsole.qml | 8 ++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/qml/Base/HPopup.qml b/src/qml/Base/HPopup.qml
index cbc8b655..cb140fa9 100644
--- a/src/qml/Base/HPopup.qml
+++ b/src/qml/Base/HPopup.qml
@@ -22,6 +22,11 @@ Popup {
         color: theme.controls.popup.background
     }
 
+    onAboutToShow: previouslyFocused = window.activeFocusItem
+    onClosed: if (previouslyFocused) previouslyFocused.forceActiveFocus()
+
+
+    property var previouslyFocused: null
 
     readonly property int maximumPreferredWidth:
         window.width - leftMargin - rightMargin - leftInset - rightInset
diff --git a/src/qml/DebugConsole.qml b/src/qml/DebugConsole.qml
index 3750b914..7f9c383a 100644
--- a/src/qml/DebugConsole.qml
+++ b/src/qml/DebugConsole.qml
@@ -17,7 +17,7 @@ HDrawer {
     z: 9999
     position: 0
 
-    property var previouslyFocusedItem: null
+    property var previouslyFocused: null
 
     property var target: null
     property alias t: debugConsole.target
@@ -66,10 +66,10 @@ HDrawer {
 
     onVisibleChanged: {
         if (visible) {
-            previouslyFocusedItem = window.activeFocusItem
+            previouslyFocused = window.activeFocusItem
             forceActiveFocus()
-        } else if (previouslyFocusedItem) {
-            previouslyFocusedItem.forceActiveFocus()
+        } else if (previouslyFocused) {
+            previouslyFocused.forceActiveFocus()
         }
     }