Hide window when performing entry auto-type on macOS

* Instead of choosing the last active window, always hide the current window (ie, KeePassXC) * Fixes #2883
keepassxreboot · Apr 11, 2019 · 17a13e3 · 17a13e3
1 parent 29c79c9
commit 17a13e3
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/src/autotype/AutoType.cpp b/src/autotype/AutoType.cpp
@@ -214,7 +214,7 @@ void AutoType::executeAutoTypeActions(const Entry* entry, QWidget* hideWindow, c
 
     if (hideWindow) {
 #if defined(Q_OS_MACOS)
-        m_plugin->raiseLastActiveWindow();
+        m_plugin->hideOwnWindow();
 #else
         hideWindow->showMinimized();
 #endif

diff --git a/src/autotype/AutoTypePlatformPlugin.h b/src/autotype/AutoTypePlatformPlugin.h
@@ -43,7 +43,7 @@ class AutoTypePlatformInterface
     virtual AutoTypeExecutor* createExecutor() = 0;
 
 #if defined(Q_OS_MACOS)
-    virtual bool raiseLastActiveWindow() = 0;
+    virtual bool hideOwnWindow() = 0;
     virtual bool raiseOwnWindow() = 0;
 #endif
 

diff --git a/src/autotype/mac/AutoTypeMac.cpp b/src/autotype/mac/AutoTypeMac.cpp
@@ -165,9 +165,9 @@ bool AutoTypePlatformMac::raiseWindow(WId pid)
 //
 // Activate last active window
 //
-bool AutoTypePlatformMac::raiseLastActiveWindow()
+bool AutoTypePlatformMac::hideOwnWindow()
 {
-    return macUtils()->raiseLastActiveWindow();
+    return macUtils()->hideOwnWindow();
 }
 
 //

diff --git a/src/autotype/mac/AutoTypeMac.h b/src/autotype/mac/AutoTypeMac.h
@@ -44,7 +44,7 @@ class AutoTypePlatformMac : public QObject, public AutoTypePlatformInterface
     bool raiseWindow(WId pid) override;
     AutoTypeExecutor* createExecutor() override;
 
-    bool raiseLastActiveWindow() override;
+    bool hideOwnWindow() override;
     bool raiseOwnWindow() override;
 
     void sendChar(const QChar& ch, bool isKeyDown);

diff --git a/src/autotype/test/AutoTypeTest.cpp b/src/autotype/test/AutoTypeTest.cpp
@@ -111,7 +111,7 @@ bool AutoTypePlatformTest::raiseWindow(WId window)
 }
 
 #if defined(Q_OS_MACOS)
-bool AutoTypePlatformTest::raiseLastActiveWindow()
+bool AutoTypePlatformTest::hideOwnWindow()
 {
     return false;
 }

diff --git a/src/autotype/test/AutoTypeTest.h b/src/autotype/test/AutoTypeTest.h
@@ -44,7 +44,7 @@ class AutoTypePlatformTest : public QObject, public AutoTypePlatformInterface, p
     AutoTypeExecutor* createExecutor() override;
 
 #if defined(Q_OS_MACOS)
-    bool raiseLastActiveWindow() override;
+    bool hideOwnWindow() override;
     bool raiseOwnWindow() override;
 #endif