Changeset 68295 in vbox for trunk/src

Timestamp:

Aug 4, 2017 10:00:45 AM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8900: UITabBar: Proper item layout counting (order); Separate main layout from the tab one.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/widgets

Files:

• UITabBar.cpp (modified) (3 diffs)
• UITabBar.h (modified) (1 diff)

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

@@ -374 +374 @@
 UITabBar::UITabBar(QWidget *pParent /* = 0 */)
     : QWidget(pParent)
-    , m_pLayout(0)
+    , m_pLayoutMain(0)
+    , m_pLayoutTab(0)
     , m_pCurrentItem(0)
 {
@@ -393 +394 @@
         connect(pItem, &UITabBarItem::sigCloseClicked, this, &UITabBar::sltHandleChildClose);
         /* Add item into layout and list: */
-        m_pLayout->insertWidget(1, pItem);
-        m_aItems << pItem;
+        m_pLayoutTab->insertWidget(0, pItem);
+        m_aItems.prepend(pItem);
         /* Return unique ID: */
         return uuid;
@@ -495 +496 @@
 {
     /* Create main layout: */
-    m_pLayout = new QHBoxLayout(this);
-    if (m_pLayout)
+    m_pLayoutMain = new QHBoxLayout(this);
+    AssertPtrReturnVoid(m_pLayoutMain);
     {
         /* Configure layout: */
-        m_pLayout->setSpacing(0);
-        m_pLayout->setContentsMargins(0, 0, 0, 0);
+        m_pLayoutMain->setSpacing(0);
+        m_pLayoutMain->setContentsMargins(0, 0, 0, 0);
 
         // TODO: Workout stretch at the and as well,
         //       depending on which alignment is set.
         /* Add strech into beginning: */
-        m_pLayout->addStretch();
+        m_pLayoutMain->addStretch();
+
+        /* Create tab layout: */
+        m_pLayoutTab = new QHBoxLayout;
+        AssertPtrReturnVoid(m_pLayoutTab);
+        {
+            /* Add into layout: */
+            m_pLayoutMain->addLayout(m_pLayoutTab);
+        }
     }
 }

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

@@ -75 +75 @@
     void prepare();
 
-    /** Holds the main layout instance. */
-    QHBoxLayout *m_pLayout;
+    /** @name Contents: Widgets
+      * @{ */
+        /** Holds the main layout instance. */
+        QHBoxLayout *m_pLayoutMain;
+        /** Holds the tab layout instance. */
+        QHBoxLayout *m_pLayoutTab;
 
-    /** Holds the current item reference. */
-    UITabBarItem *m_pCurrentItem;
+        /** Holds the current item reference. */
+        UITabBarItem *m_pCurrentItem;
 
-    /** Holds the array of items instances. */
-    QList<UITabBarItem*> m_aItems;
+        /** Holds the array of items instances. */
+        QList<UITabBarItem*> m_aItems;
+    /** @} */
 };