Changeset 52059 in vbox

Timestamp:

Jul 16, 2014 6:24:26 PM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: 3646: Status-bar Editor: X11 host support.

File:

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

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

@@ -299 +299 @@
     void sltHandleDragObjectDestroy();
 
-#ifdef RT_OS_DARWIN
     /** Performs window activation. */
     void sltActivateWindow() { activateWindow(); }
-#endif /* RT_OS_DARWIN */
 
 private:
@@ -469 +467 @@
     /* Delete window when closed: */
     setAttribute(Qt::WA_DeleteOnClose);
+#if defined(Q_WS_MAC) || defined(Q_WS_WIN)
     /* Make sure we have no background
      * until the first one paint-event: */
     setAttribute(Qt::WA_NoSystemBackground);
+#endif /* Q_WS_MAC || Q_WS_WIN */
 #if defined(Q_WS_MAC)
     /* Using native API to enable translucent background for the Mac host.
@@ -494 +494 @@
     {
         /* Configure main-layout: */
-#if defined(Q_WS_WIN)
-        /* Standard margins on Windows: */
+#ifdef Q_WS_MAC
+        /* Standard margins on Mac OS X are too big: */
+        m_pMainLayout->setContentsMargins(10, 10, 10, 5);
+#else /* !Q_WS_MAC */
+        /* Standard margins on Windows/X11: */
         int iLeft, iTop, iRight, iBottom;
         m_pMainLayout->getContentsMargins(&iLeft, &iTop, &iRight, &iBottom);
@@ -501 +504 @@
             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 */
+#endif /* !Q_WS_MAC */
         m_pMainLayout->setSpacing(0);
         /* Create close-button: */
@@ -599 +599 @@
 {
     /* Prepare geometry based on minimum size-hint: */
+    connect(this, SIGNAL(sigShown()), this, SLOT(sltActivateWindow()), Qt::QueuedConnection);
     const QSize msh = minimumSizeHint();
     setGeometry(m_rect.x(), m_rect.y() + m_rect.height() - m_statusBarRect.height() - msh.height(),
@@ -709 +710 @@
     color1.setAlpha(0);
     QColor color2 = pal.color(QPalette::Window).darker(200);
-#ifdef Q_WS_WIN
+#if defined(Q_WS_WIN) || defined(Q_WS_X11)
     QColor color3 = pal.color(QPalette::Window).darker(120);
-#endif /* Q_WS_WIN */
+#endif /* Q_WS_WIN || Q_WS_X11 */
 
     /* Left corner: */
@@ -751 +752 @@
     painter.fillRect(QRect(0, 5, 5, height() - 5), grad4);
     painter.fillRect(QRect(width() - 5, 5, 5, height() - 5), grad5);
-#ifdef Q_WS_WIN
+#if defined(Q_WS_WIN) || defined(Q_WS_X11)
     painter.save();
     painter.setPen(color3);
@@ -759 +760 @@
     painter.drawLine(QLine(QPoint(5 + 1, height() - 1),               QPoint(5 + 1, 5 + 1)));
     painter.restore();
-#endif /* Q_WS_WIN */
+#endif /* Q_WS_WIN || Q_WS_X11 */
 
     /* Paint drop token: */
@@ -1075 +1076 @@
     AssertPtrReturnVoid(statusBar());
     {
-#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 || Q_WS_MAC */
         /* Create indicator-pool: */
         m_pIndicatorsPool = new UIIndicatorsPool(machineLogic()->uisession());