Changeset 52732 in vbox

Timestamp:

Sep 12, 2014 5:30:49 PM (11 years ago)

Author:

vboxsync

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

96073

Message:

FE/Qt: Mac OS X: Runtime UI: Mini-toolbar: Should be Normal-window instead of Tool-window (latter become user-space owner instead of machine-window). Also Normal-window requirs additional handling for activation takeover.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

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

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

@@ -185 +185 @@
         return;
 
+#ifndef RT_OS_DARWIN
     /* Revoke stolen focus: */
     m_pMachineView->setFocus();
+#else /* RT_OS_DARWIN */
+    /* Revoke stolen activation: */
+    activateWindow();
+#endif /* RT_OS_DARWIN */
 }
 
@@ -244 +249 @@
                                               gEDataManager->autoHideMiniToolbar(vboxGlobal().managedVMUuid()));
     m_pMiniToolBar->addMenus(actionPool()->menus());
+#ifdef RT_OS_DARWIN
+    connect(machineLogic(), SIGNAL(sigNotifyAbout3DOverlayVisibilityChange(bool)),
+            m_pMiniToolBar, SLOT(sltHandle3DOverlayVisibilityChange(bool)));
+#endif /* RT_OS_DARWIN */
 #ifndef RT_OS_DARWIN
     connect(m_pMiniToolBar, SIGNAL(sigMinimizeAction()), this, SLOT(showMinimized()));
@@ -256 +265 @@
             actionPool()->action(UIActionIndexRT_M_Machine_S_Close), SLOT(trigger()));
 #endif /* !RT_OS_DARWIN */
-    connect(m_pMiniToolBar, SIGNAL(sigNotifyAboutFocusStolen()), this, SLOT(sltRevokeFocus()));
+    connect(m_pMiniToolBar, SIGNAL(sigNotifyAboutFocusStolen()),
+            this, SLOT(sltRevokeFocus()), Qt::QueuedConnection);
 }
 

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

@@ -52 +52 @@
                                            Qt::Alignment alignment,
                                            bool fAutoHide /* = true */)
-    : QWidget(pParent, Qt::Tool | Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint)
+    : QWidget(pParent,
+#ifndef RT_OS_DARWIN
+              Qt::Tool | Qt::WindowStaysOnTopHint |
+#else /* RT_OS_DARWIN */
+              Qt::Window |
+#endif /* RT_OS_DARWIN */
+              Qt::FramelessWindowHint)
     /* Variables: General stuff: */
     , m_geometryType(geometryType)
@@ -204 +210 @@
 void UIRuntimeMiniToolBar::prepare()
 {
+#ifdef RT_OS_DARWIN
+    /* Install own event filter: */
+    installEventFilter(this);
+#endif /* RT_OS_DARWIN */
+
 #ifdef VBOX_RUNTIME_UI_WITH_SHAPED_MINI_TOOLBAR
     /* Make sure we have no background
@@ -338 +349 @@
 bool UIRuntimeMiniToolBar::eventFilter(QObject *pWatched, QEvent *pEvent)
 {
+#ifndef RT_OS_DARWIN
     /* Due to Qt bug QMdiArea can
      * 1. steal focus from current application focus-widget
@@ -345 +357 @@
         pEvent->type() == QEvent::FocusIn)
         emit sigNotifyAboutFocusStolen();
+#else /* RT_OS_DARWIN */
+    /* Due to Qt bug on Mac OS X window will be activated
+     * even if has Qt::WA_ShowWithoutActivating attribute. */
+    if (pWatched == this &&
+        pEvent->type() == QEvent::WindowActivate)
+        emit sigNotifyAboutFocusStolen();
+#endif /* RT_OS_DARWIN */
     /* Call to base-class: */
     return QWidget::eventFilter(pWatched, pEvent);

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

@@ -91 +91 @@
 private slots:
 
+#ifdef RT_OS_DARWIN
+    /** Handle 3D overlay visibility change. */
+    void sltHandle3DOverlayVisibilityChange(bool fVisible) { if (fVisible) activateWindow(); }
+#endif /* RT_OS_DARWIN */
+
     /* Handlers: Toolbar stuff: */
     void sltHandleToolbarResize();