Changeset 68208 in vbox

Timestamp:

Jul 31, 2017 3:06:46 PM (8 years ago)

Author:

vboxsync

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

117307

Message:

FE/Qt: bugref:8900: UITabBar: A bit of cleanup; Rework UITabBarItem's close-button to be QToolButton instead of QIToolButton.

File:

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

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

@@ -27 +27 @@
 # include <QPainter>
 # include <QStyle>
+# include <QToolButton>
 
 /* GUI includes: */
-# include "QIToolButton.h"
 # include "UIIconPool.h"
 # include "UITabBar.h"
@@ -43 +43 @@
 class QLabel;
 class QStyle;
+class QToolButton;
 
 
@@ -104 +105 @@
 
     /** Holds the main layout instance. */
-    QHBoxLayout  *m_pLayout;
+    QHBoxLayout *m_pLayout;
+
     /** Holds the icon label instance. */
-    QLabel       *m_pLabelIcon;
+    QLabel      *m_pLabelIcon;
     /** Holds the name label instance. */
-    QLabel       *m_pLabelName;
+    QLabel      *m_pLabelName;
     /** Holds the close button instance. */
-    QIToolButton *m_pButtonClose;
+    QToolButton *m_pButtonClose;
 };
 
@@ -147 +149 @@
     {
         /* Update the hovered state on/off: */
-        case QEvent::Enter: m_fHovered = true; update(); break;
-        case QEvent::Leave: m_fHovered = false; update(); break;
+        case QEvent::Enter:
+        {
+            m_fHovered = true;
+            update();
+            break;
+        }
+        case QEvent::Leave:
+        {
+            m_fHovered = false;
+            update();
+            break;
+        }
 
         /* Notify listeners about the item was clicked: */
-        case QEvent::MouseButtonRelease: emit sigClicked(this); break;
+        case QEvent::MouseButtonRelease:
+        {
+            emit sigClicked(this);
+            break;
+        }
 
         default: break;
@@ -240 +256 @@
 void UITabBarItem::prepare()
 {
+    /* Configure self: */
+    setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Minimum);
+
     /* Create main layout: */
     m_pLayout = new QHBoxLayout(this);
@@ -260 +279 @@
             /* Configure label: */
             m_pLabelIcon->setPixmap(m_icon.pixmap(iMetric));
-
-            /* Add into layout: */
-            m_pLayout->addWidget(m_pLabelIcon);
         }
 
@@ -271 +287 @@
             /* Configure label: */
             m_pLabelName->setText(m_strName);
-
-            /* Add into layout: */
-            m_pLayout->addWidget(m_pLabelName);
         }
 
         /* Create close button: */
-        m_pButtonClose = new QIToolButton;
+        m_pButtonClose = new QToolButton;
         AssertPtrReturnVoid(m_pButtonClose);
         {
             /* Configure button: */
+            m_pButtonClose->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
             m_pButtonClose->setIconSize(QSize(iMetricCloseButton, iMetricCloseButton));
             m_pButtonClose->setIcon(UIIconPool::iconSet(":/close_16px.png"));
-            connect(m_pButtonClose, &QIToolButton::clicked, this, &UITabBarItem::sltCloseClicked);
-
-            /* Add into layout: */
-            m_pLayout->addWidget(m_pButtonClose);
-        }
+            m_pButtonClose->setStyleSheet("QToolButton { border: 0px }");
+            connect(m_pButtonClose, &QToolButton::clicked, this, &UITabBarItem::sltCloseClicked);
+        }
+
+        /* Add everything into main-layout: */
+        m_pLayout->addWidget(m_pLabelIcon);
+        m_pLayout->addWidget(m_pLabelName);
+        m_pLayout->addWidget(m_pButtonClose);
     }
 }