[git] Pinentry - branch, master, updated. pinentry-1.1.0-4-g141fd94

[by Andre Heinecke]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The standard pinentry collection".

The branch, master has been updated
       via  141fd941a58f70692cb6244f011e54b005d2195c (commit)
      from  84d473f5c323a3001374b0db736af9be4e3478a3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 141fd941a58f70692cb6244f011e54b005d2195c
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Thu Mar 1 16:12:28 2018 +0100

    qt: Renable Windows Foreground Window hacks
    
    * qt/main.cpp, qt/pinentryconfirm.cpp: Use raiseWindow again.
    * qt/pinentrydialog.cpp: Renable Foreground Window hacks.
    
    --
    Enabled this again because the focus did
    not change to the pinentry window without the attach
    thread input stuff. The setup_foreground_window helps though,
    so that stays. Either Qt Windows foreign Window Management
    is a mess and does not really work or I don't understand it.

diff --git a/qt/main.cpp b/qt/main.cpp
index f236781..fe88d26 100644
--- a/qt/main.cpp
+++ b/qt/main.cpp
@@ -292,7 +292,7 @@ qt_cmd_handler(pinentry_t pe)
         }
 
         box.show();
-        box.raise();
+        raiseWindow(&box);
 
         const int rc = box.exec();
 
diff --git a/qt/pinentryconfirm.cpp b/qt/pinentryconfirm.cpp
index e549e10..65b191c 100644
--- a/qt/pinentryconfirm.cpp
+++ b/qt/pinentryconfirm.cpp
@@ -38,7 +38,7 @@ PinentryConfirm::PinentryConfirm(Icon icon, int timeout, const QString &title,
     setAccessibleDescription(desc);
     setAccessibleName(title);
 #endif
-    raise();
+    raiseWindow(this);
 }
 
 bool PinentryConfirm::timedOut() const
@@ -61,7 +61,7 @@ void PinentryConfirm::showEvent(QShowEvent *event)
     }
 
     QDialog::showEvent(event);
-    raise();
+    raiseWindow(this);
 }
 
 void PinentryConfirm::slotTimeout()
diff --git a/qt/pinentrydialog.cpp b/qt/pinentrydialog.cpp
index 9bff8d2..5212f88 100644
--- a/qt/pinentrydialog.cpp
+++ b/qt/pinentrydialog.cpp
@@ -41,7 +41,6 @@
 #include <windows.h>
 #endif
 
-#if 0
 /* I [wk] have no idea for what this code was supposed to do.
    Foregrounding a window is heavily restricted by modern Windows
    versions.  This is the reason why gpg-agent employs its
@@ -57,6 +56,11 @@
    [ah 2018-02-28] Disabled this again in favor of using
    windows stays on top hint. The code that is in main
    setup_foreground_window.
+
+   [ah 2018-03-01] Enabled this again because the focus did
+   not change to the pinentry window without the attach
+   thread input stuff. The setup_foreground_window helps though
+   so that stays enabled.
    */
 #ifdef Q_OS_WIN
 WINBOOL SetForegroundWindowEx(HWND hWnd)
@@ -108,8 +112,6 @@ void raiseWindow(QWidget *w)
 #endif
 }
 
-#endif
-
 QPixmap icon(QStyle::StandardPixmap which)
 {
     QPixmap pm = qApp->windowIcon().pixmap(48, 48);
@@ -266,7 +268,7 @@ PinEntryDialog::PinEntryDialog(QWidget *parent, const char *name,
 void PinEntryDialog::showEvent(QShowEvent *event)
 {
     QDialog::showEvent(event);
-    raise();
+    raiseWindow(this);
 }
 
 void PinEntryDialog::setDescription(const QString &txt)

-----------------------------------------------------------------------

Summary of changes:
 qt/main.cpp            |  2 +-
 qt/pinentryconfirm.cpp |  4 ++--
 qt/pinentrydialog.cpp  | 10 ++++++----
 3 files changed, 9 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
The standard pinentry collection
http://git.gnupg.org