Changeset 57050 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jul 21, 2015 5:52:18 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: 5978: Runtime UI: Mini-toolbar: Simplify window activation stealing handling.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• runtime/fullscreen/UIMachineWindowFullscreen.cpp (modified) (3 diffs)
• runtime/fullscreen/UIMachineWindowFullscreen.h (modified) (1 diff)
• runtime/seamless/UIMachineWindowSeamless.cpp (modified) (3 diffs)
• runtime/seamless/UIMachineWindowSeamless.h (modified) (1 diff)
• widgets/UIMiniToolBar.cpp (modified) (3 diffs)
• widgets/UIMiniToolBar.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineWindowFullscreen.cpp

@@ -123 +123 @@
 }
 
-void UIMachineWindowFullscreen::sltRevokeFocus()
+void UIMachineWindowFullscreen::sltRevokeWindowActivation()
 {
     /* Make sure window is visible: */
@@ -129 +129 @@
         return;
 
-# if   defined(Q_WS_WIN)
-    /* Revoke stolen focus: */
-    m_pMachineView->setFocus();
-# elif defined(Q_WS_X11)
     /* Revoke stolen activation: */
     activateWindow();
-# endif /* Q_WS_X11 */
 }
 #endif /* Q_WS_WIN || Q_WS_X11 */
@@ -257 +252 @@
         connect(m_pMiniToolBar, SIGNAL(sigCloseAction()),
                 actionPool()->action(UIActionIndex_M_Application_S_Close), SLOT(trigger()));
-        connect(m_pMiniToolBar, SIGNAL(sigNotifyAboutFocusStolen()),
-                this, SLOT(sltRevokeFocus()), Qt::QueuedConnection);
+        connect(m_pMiniToolBar, SIGNAL(sigNotifyAboutWindowActivationStolen()),
+                this, SLOT(sltRevokeWindowActivation()), Qt::QueuedConnection);
     }
 }

trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineWindowFullscreen.h

@@ -65 +65 @@
     void sltMachineStateChanged();
 
-    /** Revokes keyboard-focus. */
-    void sltRevokeFocus();
+    /** Revokes window activation. */
+    void sltRevokeWindowActivation();
 #endif /* Q_WS_WIN || Q_WS_X11 */
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineWindowSeamless.cpp

@@ -64 +64 @@
 }
 
-void UIMachineWindowSeamless::sltRevokeFocus()
+void UIMachineWindowSeamless::sltRevokeWindowActivation()
 {
     /* Make sure window is visible: */
@@ -70 +70 @@
         return;
 
-# if   defined(Q_WS_WIN)
-    /* Revoke stolen focus: */
-    m_pMachineView->setFocus();
-# elif defined(Q_WS_X11)
     /* Revoke stolen activation: */
     activateWindow();
-# endif /* Q_WS_X11 */
 }
 #endif /* Q_WS_WIN || Q_WS_X11 */
@@ -139 +134 @@
         connect(m_pMiniToolBar, SIGNAL(sigCloseAction()),
                 actionPool()->action(UIActionIndex_M_Application_S_Close), SLOT(trigger()));
-        connect(m_pMiniToolBar, SIGNAL(sigNotifyAboutFocusStolen()),
-                this, SLOT(sltRevokeFocus()), Qt::QueuedConnection);
+        connect(m_pMiniToolBar, SIGNAL(sigNotifyAboutWindowActivationStolen()),
+                this, SLOT(sltRevokeWindowActivation()), Qt::QueuedConnection);
     }
 }

trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineWindowSeamless.h

@@ -44 +44 @@
     void sltMachineStateChanged();
 
-    /** Revokes keyboard-focus. */
-    void sltRevokeFocus();
+    /** Revokes window activation. */
+    void sltRevokeWindowActivation();
 #endif /* Q_WS_WIN || Q_WS_X11 */
 

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

@@ -543 +543 @@
 void UIMiniToolBar::prepare()
 {
-#if defined (Q_WS_X11)
     /* Install own event-filter
-     * to handle focus stealing: */
+     * to handle window activation stealing: */
     installEventFilter(this);
-#endif /* Q_WS_X11 */
 
 #if   defined(Q_WS_WIN)
@@ -605 +603 @@
         /* Make sure we have no focus: */
         m_pEmbeddedToolbar->setFocusPolicy(Qt::NoFocus);
-#ifdef Q_WS_WIN
-        /* Install embedded-toolbar event-filter: */
-        m_pEmbeddedToolbar->installEventFilter(this);
-#endif /* Q_WS_WIN */
     }
 
@@ -683 +677 @@
 bool UIMiniToolBar::eventFilter(QObject *pWatched, QEvent *pEvent)
 {
-#if   defined(Q_WS_WIN)
-    /* Due to Qt bug QMdiArea can
-     * 1. steal focus from current application focus-widget
-     * 3. and even request focus stealing if QMdiArea hidden yet.
-     * We have to notify listeners about such facts.. */
-    if (pWatched && m_pEmbeddedToolbar && pWatched == m_pEmbeddedToolbar &&
-        pEvent->type() == QEvent::FocusIn)
-        emit sigNotifyAboutFocusStolen();
-#elif defined(Q_WS_X11)
-    /* Detect if we have window activation stolen. */
-    if (pWatched == this &&
-        pEvent->type() == QEvent::WindowActivate)
-        emit sigNotifyAboutFocusStolen();
-#endif /* Q_WS_X11 */
+    /* Detect if we have window activation stolen: */
+    if (pWatched == this && pEvent->type() == QEvent::WindowActivate)
+        emit sigNotifyAboutWindowActivationStolen();
 
     /* Call to base-class: */

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

@@ -61 +61 @@
     void sigHoverLeave();
 
-    /** Notifies listeners about we stole focus. */
-    void sigNotifyAboutFocusStolen();
+    /** Notifies listeners about we stole window activation. */
+    void sigNotifyAboutWindowActivationStolen();
 
 public:
@@ -109 +109 @@
     void sltHoverLeave();
 
-    /** Notifies listeners about we stole focus. */
-    void sltNotifyAboutFocusStolen() { emit sigNotifyAboutFocusStolen(); }
+    /** Notifies listeners about we stole window activation. */
+    void sltNotifyAboutWindowActivationStolen() { emit sigNotifyAboutWindowActivationStolen(); }
 
 private: