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

Timestamp:

Jul 31, 2017 3:11:13 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8900: UITabBar: Proper macOS layout for close-button.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/widgets/UITabBar.cpp (modified) (8 diffs)

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

@@ -26 +26 @@
 # include <QLabel>
 # include <QPainter>
+# ifdef VBOX_WS_MAC
+#  include <QStackedLayout>
+# endif
 # include <QStyle>
 # include <QToolButton>
@@ -42 +45 @@
 class QHBoxLayout;
 class QLabel;
+#ifdef VBOX_WS_MAC
+class QStackedLayout;
+#endif
 class QStyle;
 class QToolButton;
@@ -105 +111 @@
 
     /** Holds the main layout instance. */
-    QHBoxLayout *m_pLayout;
+    QHBoxLayout    *m_pLayout;
+#ifdef VBOX_WS_MAC
+    /** Holds the stacked layout instance. */
+    QStackedLayout *m_pLayoutStacked;
+#endif
 
     /** Holds the icon label instance. */
@@ -127 +137 @@
     , m_fHovered(false)
     , m_pLayout(0)
+#ifdef VBOX_WS_MAC
+    , m_pLayoutStacked(0)
+#endif
     , m_pLabelIcon(0)
     , m_pLabelName(0)
@@ -151 +164 @@
         case QEvent::Enter:
         {
+#ifdef VBOX_WS_MAC
+            m_pLayoutStacked->setCurrentWidget(m_pButtonClose);
+#endif
             m_fHovered = true;
             update();
@@ -157 +173 @@
         case QEvent::Leave:
         {
+#ifdef VBOX_WS_MAC
+            m_pLayoutStacked->setCurrentWidget(m_pLabelIcon);
+#endif
             m_fHovered = false;
             update();
@@ -267 +286 @@
         const int iMargin = iMetric / 2;
         const int iSpacing = iMargin / 2;
+#ifdef VBOX_WS_MAC
+        const int iMetricCloseButton = iMetric * 3 / 4;
+#else
         const int iMetricCloseButton = iMetric * 2 / 3;
+#endif
 
         /* Configure layout: */
+#ifdef VBOX_WS_MAC
+        m_pLayout->setContentsMargins(iMargin + iSpacing, 0, iMargin + iSpacing, 0);
+#else
         m_pLayout->setContentsMargins(iMargin + iSpacing, 0, iMargin, 0);
+#endif
         m_pLayout->setSpacing(iSpacing);
 
@@ -301 +328 @@
         }
 
+#ifdef VBOX_WS_MAC
+        /* Create stacked-layout: */
+        m_pLayoutStacked = new QStackedLayout(m_pLayout);
+        {
+            m_pLayoutStacked->setAlignment(Qt::AlignCenter);
+
+            /* Add icon-label and close-button into stacked-layout: */
+            m_pLayoutStacked->addWidget(m_pLabelIcon);
+            m_pLayoutStacked->addWidget(m_pButtonClose);
+            m_pLayoutStacked->setAlignment(m_pLabelIcon, Qt::AlignCenter);
+            m_pLayoutStacked->setAlignment(m_pButtonClose, Qt::AlignCenter);
+
+            /* Add stacked-layout into main-layout: */
+            m_pLayout->addLayout(m_pLayoutStacked);
+        }
+
+        /* Add name-label into main-layout: */
+        m_pLayout->addWidget(m_pLabelName);
+#else /* !VBOX_WS_MAC */
         /* Add everything into main-layout: */
         m_pLayout->addWidget(m_pLabelIcon);
         m_pLayout->addWidget(m_pLabelName);
         m_pLayout->addWidget(m_pButtonClose);
+#endif /* !VBOX_WS_MAC */
     }
 }