Changeset 50816 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Mar 19, 2014 7:47:53 AM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: Runtime UI: Fullscreen/Seamless modes: Prevent mini-toolbar from stealing focus from machine-view.

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) (2 diffs)
• runtime/seamless/UIMachineWindowSeamless.h (modified) (1 diff)
• widgets/UIMiniToolBar.cpp (modified) (4 diffs)
• widgets/UIMiniToolBar.h (modified) (2 diffs)

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

@@ -164 +164 @@
 }
 #endif /* Q_WS_MAC */
+
+void UIMachineWindowFullscreen::sltRevokeFocus()
+{
+    /* Revoke stolen focus: */
+    m_pMachineView->setFocus();
+}
 
 void UIMachineWindowFullscreen::prepareMenu()
@@ -248 +254 @@
     connect(m_pMiniToolBar, SIGNAL(sigCloseAction()),
             gActionPool->action(UIActionIndexRuntime_Simple_Close), SLOT(trigger()));
+    connect(m_pMiniToolBar, SIGNAL(sigNotifyAboutFocusStolen()), this, SLOT(sltRevokeFocus()));
 }
 
@@ -345 +352 @@
     placeOnScreen();
 
-#ifdef Q_WS_WIN
-    /* On Windows we should activate main window first,
-     * because entering fullscreen there doesn't means window will be auto-activated,
-     * so no window-activation event will be received and no keyboard-hook created otherwise... */
-    if (m_uScreenId == 0)
-        setWindowState(windowState() | Qt::WindowActive);
-#endif /* Q_WS_WIN */
-
 #ifdef Q_WS_MAC
     /* ML and next using native stuff, so we can call for simple show(): */

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

@@ -70 +70 @@
 #endif /* RT_OS_DARWIN */
 
+    /** Revokes keyboard-focus. */
+    void sltRevokeFocus();
+
 private:
 

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

@@ -69 +69 @@
         QTimer::singleShot(0, m_pMainMenu, SLOT(sltHighlightFirstAction()));
     }
+}
+
+void UIMachineWindowSeamless::sltRevokeFocus()
+{
+    /* Revoke stolen focus: */
+    m_pMachineView->setFocus();
 }
 
@@ -152 +158 @@
     connect(m_pMiniToolBar, SIGNAL(sigCloseAction()),
             gActionPool->action(UIActionIndexRuntime_Simple_Close), SLOT(trigger()));
+    connect(m_pMiniToolBar, SIGNAL(sigNotifyAboutFocusStolen()), this, SLOT(sltRevokeFocus()));
 }
 #endif /* !Q_WS_MAC */

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

@@ -45 +45 @@
     /* Popup main menu: */
     void sltPopupMainMenu();
+
+    /** Revokes keyboard-focus. */
+    void sltRevokeFocus();
 
 private:

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

@@ -193 +193 @@
     /* Simulate toolbar auto-hiding: */
     simulateToolbarAutoHiding();
-
-    /* Due to [probably] Qt bug QMdiSubWindow still
-     * can receive focus even if focus policy is Qt::NoFocus,
-     * We should return the focus to our parent: */
-    parentWidget()->setFocus();
 }
 
@@ -260 +255 @@
     m_pToolbar = new UIMiniToolBar;
     {
+        /* Make sure we have no focus: */
+        m_pToolbar->setFocusPolicy(Qt::NoFocus);
         /* Propagate known options to child: */
         m_pToolbar->setAutoHide(m_fAutoHide);
@@ -279 +276 @@
         m_pEmbeddedToolbar = m_pMdiArea->addSubWindow(m_pToolbar, Qt::Window | Qt::FramelessWindowHint);
         /* Make sure we have no focus: */
-        m_pToolbar->setFocusPolicy(Qt::NoFocus);
         m_pEmbeddedToolbar->setFocusPolicy(Qt::NoFocus);
+        m_pEmbeddedToolbar->installEventFilter(this);
     }
 
@@ -340 +337 @@
     if (m_fAutoHide)
         m_pHoverLeaveTimer->start();
+}
+
+bool UIRuntimeMiniToolBar::eventFilter(QObject *pWatched, QEvent *pEvent)
+{
+    /* 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();
+    /* Call to base-class: */
+    return QWidget::eventFilter(pWatched, pEvent);
 }
 

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

@@ -64 +64 @@
     void sigHoverLeave();
 
+    /** Notifies listeners about we stole focus. */
+    void sigNotifyAboutFocusStolen();
+
 public:
 
@@ -109 +112 @@
     void enterEvent(QEvent *pEvent);
     void leaveEvent(QEvent *pEvent);
+
+    /** Filters @a pEvent if <i>this</i> object has been
+      * installed as an event-filter for the @a pWatched. */
+    bool eventFilter(QObject *pWatched, QEvent *pEvent);
 
     /* Helper: Hover stuff: */