Changeset 92848 in vbox

Timestamp:

Dec 9, 2021 1:48:59 PM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

148777

Message:

FE/Qt: bugref:10166: UIMiniToolBar: Reworking old machine-window focus stealing workaround to be more careful; You can't just manipulate window activation state while popups shown and remain sane.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/widgets

Files:

• UIMiniToolBar.cpp (modified) (3 diffs)
• UIMiniToolBar.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp

@@ -585 +585 @@
 }
 
+void UIMiniToolBar::sltCheckWindowActivationSanity()
+{
+    /* Do nothing if other window is already active: */
+    if (QGuiApplication::focusWindow() != windowHandle())
+        return;
+
+    /* We can't touch window activation if have modal or popup
+     * window opened, otherwise internal Qt state get flawed: */
+    if (   QApplication::activeModalWidget()
+        || QApplication::activePopupWidget())
+    {
+        /* But we should recheck the state in let's say 300ms: */
+        QTimer::singleShot(300, this, SLOT(sltCheckWindowActivationSanity()));
+        return;
+    }
+
+    /* Notify listener about we have stole window activation: */
+    emit sigNotifyAboutWindowActivationStolen();
+}
+
 void UIMiniToolBar::sltHide()
 {
@@ -999 +1019 @@
     {
 #if   defined(VBOX_WS_WIN)
-        emit sigNotifyAboutWindowActivationStolen();
+        /* Just call the method asynchronously, after possible popups opened: */
+        QTimer::singleShot(0, this, SLOT(sltCheckWindowActivationSanity()));
 #elif defined(VBOX_WS_X11)
         switch (uiCommon().typeOfWindowManager())
@@ -1011 +1032 @@
                 // In fact, Qt is not become aware of actual window activation later,
                 // so we are going to return window activation in let's say 100ms.
-                QTimer::singleShot(100, this, SLOT(sltNotifyAboutWindowActivationStolen()));
+                QTimer::singleShot(100, this, SLOT(sltCheckWindowActivationSanity()));
                 break;
             }
             default:
             {
-                emit sigNotifyAboutWindowActivationStolen();
+                /* Just call the method asynchronously, after possible popups opened: */
+                QTimer::singleShot(0, this, SLOT(sltCheckWindowActivationSanity()));
                 break;
             }

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.h

@@ -120 +120 @@
     void sltHoverLeave();
 
-    /** Notifies listeners about we stole window activation. */
-    void sltNotifyAboutWindowActivationStolen() { emit sigNotifyAboutWindowActivationStolen(); }
+    /** Check whether we still have window activation token. */
+    void sltCheckWindowActivationSanity();
 
     /** Hides window. */