Changeset 74138 in vbox for trunk/src/VBox/Frontends

Timestamp:

Sep 7, 2018 11:16:21 AM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: VirtualBox Manager UI: Chooser pane re-styling: Adjust global item to have a height of main toolbar.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/manager

Files:

• UIVirtualBoxManagerWidget.cpp (modified) (1 diff)
• chooser/UIChooser.cpp (modified) (1 diff)
• chooser/UIChooser.h (modified) (1 diff)
• chooser/UIChooserItemGlobal.cpp (modified) (6 diffs)
• chooser/UIChooserItemGlobal.h (modified) (2 diffs)
• chooser/UIChooserModel.cpp (modified) (1 diff)
• chooser/UIChooserModel.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp

@@ -550 +550 @@
 {
     /* Tool-bar connections: */
+    connect(m_pToolBar, &UIToolBar::sigResized,
+            m_pPaneChooser, &UIChooser::sltHandleToolbarResize);
     connect(m_pToolBar, &UIToolBar::customContextMenuRequested,
             this, &UIVirtualBoxManagerWidget::sltHandleContextMenuRequest);

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooser.cpp

@@ -112 +112 @@
 }
 
+void UIChooser::sltHandleToolbarResize(const QSize &newSize)
+{
+    /* Pass height to a model: */
+    model()->setGlobalItemHeightHint(newSize.height());
+}
+
 void UIChooser::preparePalette()
 {

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooser.h

@@ -82 +82 @@
     bool isGroupSavingInProgress() const;
 
+public slots:
+
+    /** Handles toolbar resize to @a newSize. */
+    void sltHandleToolbarResize(const QSize &newSize);
+
 private:
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGlobal.cpp

@@ -43 +43 @@
     , m_iMinimumNameWidth(0)
     , m_iMaximumNameWidth(0)
+    , m_iHeightHint(0)
 {
     /* Prepare: */
@@ -118 +119 @@
 }
 
+void UIChooserItemGlobal::setHeightHint(int iHint)
+{
+    /* Remember a new hint: */
+    m_iHeightHint = iHint;
+
+    /* Update geometry and the model layout: */
+    updateGeometry();
+    model()->updateLayout();
+}
+
 void UIChooserItemGlobal::retranslateUi()
 {
@@ -290 +301 @@
 {
     /* Prepare variables: */
-    int iMargin = data(GlobalItemData_Margin).toInt();
-    int iSpacing = data(GlobalItemData_Spacing).toInt();
+    const int iMargin = data(GlobalItemData_Margin).toInt();
+    const int iSpacing = data(GlobalItemData_Spacing).toInt();
 
     /* Calculating proposed width: */
@@ -298 +309 @@
     /* Two margins: */
     iProposedWidth += 2 * iMargin;
-    /* And global-item content to take into account: */
+    /* And global-item content width: */
     iProposedWidth += (m_pixmapSize.width() +
                        iSpacing +
@@ -310 +321 @@
 {
     /* Prepare variables: */
-    int iMargin = data(GlobalItemData_Margin).toInt();
+    const int iMargin = data(GlobalItemData_Margin).toInt();
 
     /* Calculating proposed height: */
     int iProposedHeight = 0;
 
-    /* Two margins: */
-    iProposedHeight += 2 * iMargin;
-    /* And global-item content to take into account: */
-    iProposedHeight += qMax(m_pixmapSize.height(), m_visibleNameSize.height());
+    /* Global-item content height: */
+    const int iContentHeight = qMax(m_pixmapSize.height(), m_visibleNameSize.height());
+
+    /* If we have height hint: */
+    if (m_iHeightHint)
+    {
+        /* Take the largest value between height hint and content height: */
+        iProposedHeight += qMax(m_iHeightHint, iContentHeight);
+    }
+    /* Otherwise: */
+    else
+    {
+        /* Two margins: */
+        iProposedHeight += 2 * iMargin;
+        /* And content height: */
+        iProposedHeight += iContentHeight;
+    }
 
     /* Return result: */
@@ -391 +415 @@
     {
         /* Layout hints: */
-        case GlobalItemData_Margin: return QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize) / 4;
+        case GlobalItemData_Margin:  return QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize) / 3 * 2;
         case GlobalItemData_Spacing: return QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize) / 2;
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGlobal.h

@@ -46 +46 @@
     virtual ~UIChooserItemGlobal() /* override */;
 
+    /** @name Layout stuff.
+      * @{ */
+        /** Defines height @a iHint. */
+        void setHeightHint(int iHint);
+    /** @} */
+
 protected:
 
@@ -243 +249 @@
         /** Holds maximum name width. */
         int  m_iMaximumNameWidth;
+
+        /** Holds the height hint. */
+        int  m_iHeightHint;
     /** @} */
 };

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserModel.cpp

@@ -189 +189 @@
     /* Make sure root-item is shown: */
     root()->show();
+}
+
+void UIChooserModel::setGlobalItemHeightHint(int iHint)
+{
+    /* Walk thrugh all the items of navigation list: */
+    foreach (UIChooserItem *pItem, navigationList())
+    {
+        /* And for each global item: */
+        if (pItem->type() == UIChooserItemType_Global)
+        {
+            /* Apply the height hint we have: */
+            UIChooserItemGlobal *pGlobalItem = pItem->toGlobalItem();
+            if (pGlobalItem)
+                pGlobalItem->setHeightHint(iHint);
+        }
+    }
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserModel.h

@@ -103 +103 @@
     /* API: Layout stuff: */
     void updateLayout();
+    /** Defines global item height @a iHint. */
+    void setGlobalItemHeightHint(int iHint);
 
     /* API: Navigation stuff: */