Changeset 73992 in vbox for trunk/src

Timestamp:

Aug 31, 2018 10:15:04 AM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: VirtualBox Manager UI: Chooser pane re-styling: Group item: No need for root indent.

Location:

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

Files:

• UIChooserItemGroup.cpp (modified) (15 diffs)
• UIChooserItemGroup.h (modified) (1 diff)

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

@@ -750 +750 @@
     int iMinorSpacing = data(GroupItemData_MinorSpacing).toInt();
     int iFullHeaderHeight = m_minimumHeaderSize.height();
-    int iRootIndent = data(GroupItemData_RootIndent).toInt();
     int iPreviousVerticalIndent = 0;
 
@@ -756 +755 @@
     if (isRoot())
     {
-        /* Header (main root-item): */
-        if (isMainRoot())
-        {
-            /* Prepare body indent: */
-            iPreviousVerticalIndent = iRootIndent;
-        }
         /* Header (non-main root-item): */
-        else
+        if (!isMainRoot())
         {
             /* Hide unnecessary buttons: */
@@ -777 +770 @@
                 int iExitButtonHeight = m_exitButtonSize.height();
                 /* Layout exit-button: */
-                int iExitButtonX = iHorizontalMargin + iRootIndent;
+                int iExitButtonX = iHorizontalMargin;
                 int iExitButtonY = iExitButtonHeight == iFullHeaderHeight ? iVerticalMargin :
                                    iVerticalMargin + (iFullHeaderHeight - iExitButtonHeight) / 2;
@@ -852 +845 @@
     {
         /* Prepare variables: */
-        int iHorizontalIndent = isRoot() ? iRootIndent : iHorizontalMargin;
+        int iHorizontalIndent = isRoot() ? 0 : iHorizontalMargin;
         QRect geo = geometry().toRect();
         int iX = geo.x();
@@ -1293 +1286 @@
         /* Layout hints: */
         case GroupItemData_HorizonalMargin: return QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize) / 4;
-        case GroupItemData_VerticalMargin: return QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize) / 4;
-        case GroupItemData_MajorSpacing: return QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize) / 2;
-        case GroupItemData_MinorSpacing: return QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize) / 5;
-        case GroupItemData_RootIndent: return QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize) / 6;
+        case GroupItemData_VerticalMargin:  return QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize) / 4;
+        case GroupItemData_MajorSpacing:    return QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize) / 2;
+        case GroupItemData_MinorSpacing:    return QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize) / 5;
 
         /* Default: */
@@ -1416 +1408 @@
         if (hasItems())
         {
-            /* Prepare variables: */
-            int iRootIndent = data(GroupItemData_RootIndent).toInt();
-
             /* We have to take every child width into account: */
             int iMaximumChildWidth = 0;
@@ -1424 +1413 @@
                 iMaximumChildWidth = qMax(iMaximumChildWidth, pItem->minimumWidthHint());
             iProposedWidth += iMaximumChildWidth;
-
-            /* And 2 indents at last - left and right: */
-            iProposedWidth += 2 * iRootIndent;
         }
     }
@@ -1470 +1456 @@
         if (hasItems())
         {
-            /* Prepare variables: */
-            int iRootIndent = data(GroupItemData_RootIndent).toInt();
-
-            /* Main root-item have 2 indents - top and bottom: */
-            iProposedHeight += 2 * iRootIndent;
             /* And every existing: */
             foreach (UIChooserItem *pItem, items())
@@ -1544 +1525 @@
     int iMajorSpacing = data(GroupItemData_MajorSpacing).toInt();
     int iMinorSpacing = data(GroupItemData_MinorSpacing).toInt();
-    int iRootIndent = data(GroupItemData_RootIndent).toInt();
     int iToggleButtonWidth = m_toggleButtonSize.width();
     int iEnterButtonWidth = m_enterButtonSize.width();
@@ -1555 +1535 @@
 
     /* Left margin: */
-    if (isRoot())
-        iMaximumWidth -= iRootIndent;
     iMaximumWidth -= iHorizontalMargin;
     /* Button width: */
@@ -1581 +1559 @@
     /* Right margin: */
     iMaximumWidth -= iHorizontalMargin;
-    if (isRoot())
-        iMaximumWidth -= iRootIndent;
     /* Calculate new visible name and name-size: */
     QPaintDevice *pPaintDevice = model()->paintDevice();
@@ -1715 +1691 @@
             /* Prepare variables: */
             int iMargin = data(GroupItemData_VerticalMargin).toInt();
-            int iRootIndent = data(GroupItemData_RootIndent).toInt();
             int iHeaderHeight = m_minimumHeaderSize.height();
             int iFullHeaderHeight = 2 * iMargin + iHeaderHeight;
@@ -1722 +1697 @@
             /* Add clipping: */
             QPainterPath path;
-            path.moveTo(iRootIndent, 0);
+            path.moveTo(0, 0);
             path.lineTo(path.currentPosition().x(), iFullHeaderHeight - iMetric);
             path.arcTo(QRectF(path.currentPosition(), QSizeF(2 * iMetric, 2 * iMetric)).translated(0, -iMetric), 180, 90);
-            path.lineTo(rect.width() - iMetric - iRootIndent, path.currentPosition().y());
+            path.lineTo(rect.width() - iMetric, path.currentPosition().y());
             path.arcTo(QRectF(path.currentPosition(), QSizeF(2 * iMetric, 2 * iMetric)).translated(-iMetric, -2 * iMetric), 270, 90);
             path.lineTo(path.currentPosition().x(), 0);
@@ -1824 +1799 @@
     int iVerticalMargin = data(GroupItemData_VerticalMargin).toInt();
     int iMajorSpacing = data(GroupItemData_MajorSpacing).toInt();
-    int iRootIndent = data(GroupItemData_RootIndent).toInt();
     int iFullHeaderHeight = m_minimumHeaderSize.height();
 
@@ -1843 +1817 @@
     int iNameX = iHorizontalMargin;
     if (isRoot())
-        iNameX += iRootIndent + m_exitButtonSize.width();
+        iNameX += m_exitButtonSize.width();
     else
         iNameX += m_toggleButtonSize.width();

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

@@ -244 +244 @@
         GroupItemData_MajorSpacing,
         GroupItemData_MinorSpacing,
-        GroupItemData_RootIndent,
     };