Changeset 52873 in vbox

Timestamp:

Sep 26, 2014 5:00:10 PM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: Runtime UI: Mini-toolbar rework 02 (stolen focus/activation protection).

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

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

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

@@ -185 +185 @@
         return;
 
-#ifndef RT_OS_DARWIN
+#if   defined(Q_WS_WIN)
     /* Revoke stolen focus: */
     m_pMachineView->setFocus();
-#else /* RT_OS_DARWIN */
+#elif defined(Q_WS_MAC)
     /* Revoke stolen activation: */
     activateWindow();
-#endif /* RT_OS_DARWIN */
+#endif /* Q_WS_MAC */
 }
 

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

@@ -71 +71 @@
         return;
 
+#if   defined(Q_WS_WIN)
     /* Revoke stolen focus: */
     m_pMachineView->setFocus();
+#elif defined(Q_WS_MAC)
+    /* Revoke stolen activation: */
+    activateWindow();
+#endif /* Q_WS_MAC */
 }
 

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

@@ -226 +226 @@
 void UIRuntimeMiniToolBar::prepare()
 {
-#ifdef RT_OS_DARWIN
+#ifdef Q_WS_MAC
     /* Install own event filter: */
     installEventFilter(this);
-#endif /* RT_OS_DARWIN */
+#endif /* Q_WS_MAC */
 
 #if defined(Q_WS_MAC) || defined(Q_WS_WIN)
@@ -296 +296 @@
         /* 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 */
     }
 
@@ -365 +368 @@
 bool UIRuntimeMiniToolBar::eventFilter(QObject *pWatched, QEvent *pEvent)
 {
-#ifndef RT_OS_DARWIN
+#if   defined(Q_WS_WIN)
     /* Due to Qt bug QMdiArea can
      * 1. steal focus from current application focus-widget
@@ -373 +376 @@
         pEvent->type() == QEvent::FocusIn)
         emit sigNotifyAboutFocusStolen();
-#else /* RT_OS_DARWIN */
+#elif defined(Q_WS_MAC)
     /* Due to Qt bug on Mac OS X window will be activated
      * even if has Qt::WA_ShowWithoutActivating attribute. */
@@ -379 +382 @@
         pEvent->type() == QEvent::WindowActivate)
         emit sigNotifyAboutFocusStolen();
-#endif /* RT_OS_DARWIN */
+#endif /* Q_WS_MAC */
+
     /* Call to base-class: */
     return QWidget::eventFilter(pWatched, pEvent);