Changeset 52056 in vbox for trunk/src/VBox

Timestamp:

Jul 16, 2014 5:09:15 PM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: 3646: Status-bar Editor: Mac OS X host support.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.cpp (modified) (16 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.cpp

@@ -239 +239 @@
         return QWidget::mouseMoveEvent(pEvent);
 
+    /* Revoke hovered state: */
+    m_fHovered = false;
+    /* Update: */
+    update();
+
     /* Initialize dragging: */
     m_mousePressPosition = QPoint();
@@ -285 +290 @@
     void sltParentGeometryChanged(const QRect &rect);
 
+    /** Handles 3D overlay visibility change. */
+    void sltHandle3DOverlayVisibilityChange();
+
     /** Handles configuration change. */
     void sltHandleConfigurationChange();
@@ -304 +312 @@
     /** Prepare animation routine. */
     void prepareAnimation();
+    /** Prepare geometry. */
+    void prepareGeometry();
 
     /** Updates status buttons. */
@@ -412 +422 @@
 }
 
+void UIStatusBarEditorWindow::sltHandle3DOverlayVisibilityChange()
+{
+    /* Reactivate window when 3D overlay covered us: */
+    activateWindow();
+}
+
 void UIStatusBarEditorWindow::sltHandleConfigurationChange()
 {
@@ -457 +473 @@
     /* Delete window when closed: */
     setAttribute(Qt::WA_DeleteOnClose);
-    /* Make window background translucent: */
+    /* Make sure we have no background
+     * until the first one paint-event: */
+    setAttribute(Qt::WA_NoSystemBackground);
+#if defined(Q_WS_MAC)
+    /* Using native API to enable translucent background for the Mac host.
+     * - We also want to disable window-shadows which is possible
+     *   using Qt::WA_MacNoShadow only since Qt 4.8,
+     *   while minimum supported version is 4.7.1 for now: */
+    ::darwinSetShowsWindowTransparent(this, true);
+#elif defined(Q_WS_WIN)
+    /* Using Qt API to enable translucent background:
+     * - Under Win host Qt conflicts with 3D stuff (black seamless regions).
+     * - Under Mac host Qt doesn't allows to disable window-shadows
+     *   until version 4.8, but minimum supported version is 4.7.1 for now.
+     * - Under x11 host Qt has it broken with KDE 4.9 (black background): */
     setAttribute(Qt::WA_TranslucentBackground);
+#endif /* Q_WS_WIN */
     /* Track D&D events: */
     setAcceptDrops(true);
@@ -467 +498 @@
     {
         /* Configure main-layout: */
+#if defined(Q_WS_WIN)
+        /* Standard margins on Windows: */
         int iLeft, iTop, iRight, iBottom;
         m_pMainLayout->getContentsMargins(&iLeft, &iTop, &iRight, &iBottom);
@@ -472 +505 @@
             iBottom -= 5;
         m_pMainLayout->setContentsMargins(iLeft, iTop, iRight, iBottom);
+#elif defined(Q_WS_MAC)
+        /* Standard margins on Mac OS X are too big: */
+        m_pMainLayout->setContentsMargins(10, 10, 10, 5);
+#endif /* Q_WS_MAC */
         m_pMainLayout->setSpacing(0);
         /* Create close-button: */
@@ -478 +515 @@
         {
             /* Configure close-button: */
+            m_pButtonClose->setFocusPolicy(Qt::StrongFocus);
             m_pButtonClose->setMinimumSize(QSize(1, 1));
             m_pButtonClose->setShortcut(Qt::Key_Escape);
@@ -506 +544 @@
     /* Prepare animation: */
     prepareAnimation();
+    /* Prepare geometry: */
+    prepareGeometry();
 
     /* Activate window: */
@@ -558 +598 @@
     /* Update animation: */
     updateAnimation();
+}
+
+void UIStatusBarEditorWindow::prepareGeometry()
+{
+    /* Prepare geometry based on minimum size-hint: */
+    const QSize msh = minimumSizeHint();
+    setGeometry(m_rect.x(), m_rect.y() + m_rect.height() - m_statusBarRect.height() - msh.height(),
+                qMax(m_rect.width(), msh.width()), msh.height());
+#ifdef Q_WS_WIN
+    raise();
+#endif /* Q_WS_WIN */
 }
 
@@ -608 +659 @@
     setGeometry(m_rect.x(), m_rect.y() + m_rect.height() - m_statusBarRect.height() - sh.height(),
                 qMax(m_rect.width(), sh.width()), sh.height());
+#ifdef Q_WS_WIN
     raise();
+#endif /* Q_WS_WIN */
 }
 
@@ -660 +713 @@
     color1.setAlpha(0);
     QColor color2 = pal.color(QPalette::Window).darker(200);
+#ifdef Q_WS_WIN
     QColor color3 = pal.color(QPalette::Window).darker(120);
+#endif /* Q_WS_WIN */
 
     /* Left corner: */
@@ -700 +755 @@
     painter.fillRect(QRect(0, 5, 5, height() - 5), grad4);
     painter.fillRect(QRect(width() - 5, 5, 5, height() - 5), grad5);
+#ifdef Q_WS_WIN
     painter.save();
     painter.setPen(color3);
@@ -707 +763 @@
     painter.drawLine(QLine(QPoint(5 + 1, height() - 1),               QPoint(5 + 1, 5 + 1)));
     painter.restore();
+#endif /* Q_WS_WIN */
 
     /* Paint drop token: */
@@ -927 +984 @@
         connect(this, SIGNAL(sigGeometryChange(const QRect&)),
                 pStatusBarEditor, SLOT(sltParentGeometryChanged(const QRect&)));
+        connect(machineLogic(), SIGNAL(sigNotifyAbout3DOverlayVisibilityChange(bool)),
+                pStatusBarEditor, SLOT(sltHandle3DOverlayVisibilityChange()));
         connect(pStatusBarEditor, SIGNAL(destroyed(QObject*)),
                 this, SLOT(sltStatusBarEditorWindowClosed()));
@@ -1018 +1077 @@
     AssertPtrReturnVoid(statusBar());
     {
-#ifdef Q_WS_WIN
+#if defined(Q_WS_WIN) || defined (Q_WS_MAC)
         /* Configure status-bar: */
         statusBar()->setContextMenuPolicy(Qt::CustomContextMenu);
         connect(statusBar(), SIGNAL(customContextMenuRequested(const QPoint&)),
                 this, SLOT(sltShowStatusBarContextMenu(const QPoint&)));
-#endif /* Q_WS_WIN */
+#endif /* Q_WS_WIN || Q_WS_MAC */
         /* Create indicator-pool: */
         m_pIndicatorsPool = new UIIndicatorsPool(machineLogic()->uisession());