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

Timestamp:

Aug 31, 2018 10:28:57 AM (6 years ago)

Author:

vboxsync

Message:

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

Location:

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

Files:

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

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

@@ -748 +748 @@
     int iHorizontalMargin = data(GroupItemData_HorizonalMargin).toInt();
     int iVerticalMargin = data(GroupItemData_VerticalMargin).toInt();
-    int iMinorSpacing = data(GroupItemData_MinorSpacing).toInt();
     int iFullHeaderHeight = m_minimumHeaderSize.height();
     int iPreviousVerticalIndent = 0;
@@ -779 +778 @@
 
             /* Prepare body indent: */
-            iPreviousVerticalIndent = iVerticalMargin + iFullHeaderHeight + iVerticalMargin + iMinorSpacing;
+            iPreviousVerticalIndent = iVerticalMargin + iFullHeaderHeight + iVerticalMargin;
         }
     }
@@ -821 +820 @@
         {
             /* Prepare variables: */
-            int iMajorSpacing = data(GroupItemData_MajorSpacing).toInt();
+            int iMajorSpacing = data(GroupItemData_Spacing).toInt();
             int iToggleButtonWidth = m_toggleButtonSize.width();
             /* Layout name-editor: */
@@ -865 +864 @@
             pItem->updateLayout();
             /* Update indent for next items: */
-            iPreviousVerticalIndent += (iMinimumHeight + iMinorSpacing);
+            iPreviousVerticalIndent += iMinimumHeight;
         }
     }
@@ -1287 +1286 @@
         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_Spacing:    return QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize) / 2;
 
         /* Default: */
@@ -1444 +1442 @@
 int UIChooserItemGroup::minimumHeightHintForGroup(bool fGroupOpened) const
 {
-    /* Prepare variables: */
-    int iMinorSpacing = data(GroupItemData_MinorSpacing).toInt();
-
     /* Calculating proposed height: */
     int iProposedHeight = 0;
@@ -1456 +1451 @@
         if (hasItems())
         {
-            /* And every existing: */
+            /* And every existing child height: */
             foreach (UIChooserItem *pItem, items())
-            {
-                /* Child height: */
                 iProposedHeight += pItem->minimumHeightHint();
-                /* And interline spacing: */
-                iProposedHeight += iMinorSpacing;
-            }
-            /* Excpect the last one spacing: */
-            iProposedHeight -= iMinorSpacing;
         }
     }
@@ -1487 +1475 @@
             /* We should take into spacing between header and body: */
             iProposedHeight += iVerticalMargin;
-            /* Every existing: */
+            /* And every existing child height: */
             foreach (UIChooserItem *pItem, items())
-            {
-                /* Child height: */
                 iProposedHeight += pItem->minimumHeightHint();
-                /* And interline spacing: */
-                iProposedHeight += iMinorSpacing;
-            }
-            /* Excpect the last one spacing: */
-            iProposedHeight -= iMinorSpacing;
             /* And bottom margin at last: */
             iProposedHeight += iHorizontalMargin;
@@ -1523 +1504 @@
     /* Prepare variables: */
     int iHorizontalMargin = data(GroupItemData_HorizonalMargin).toInt();
-    int iMajorSpacing = data(GroupItemData_MajorSpacing).toInt();
-    int iMinorSpacing = data(GroupItemData_MinorSpacing).toInt();
+    int iMajorSpacing = data(GroupItemData_Spacing).toInt();
     int iToggleButtonWidth = m_toggleButtonSize.width();
     int iEnterButtonWidth = m_enterButtonSize.width();
@@ -1555 +1535 @@
         /* Spacing + button width: */
         if (!isRoot())
-            iMaximumWidth -= (iMinorSpacing + iEnterButtonWidth);
+            iMaximumWidth -= iEnterButtonWidth;
     }
     /* Right margin: */
@@ -1595 +1575 @@
 
     /* Prepare variables: */
-    int iMajorSpacing = data(GroupItemData_MajorSpacing).toInt();
-    int iMinorSpacing = data(GroupItemData_MinorSpacing).toInt();
+    int iMajorSpacing = data(GroupItemData_Spacing).toInt();
 
     /* Calculate minimum visible name size: */
@@ -1627 +1606 @@
     /* Spacing + button width: */
     if (!isRoot())
-        iHeaderWidth += (iMinorSpacing + m_enterButtonSize.width());
+        iHeaderWidth += m_enterButtonSize.width();
 
     /* Calculate maximum height: */
@@ -1798 +1777 @@
     int iHorizontalMargin = data(GroupItemData_HorizonalMargin).toInt();
     int iVerticalMargin = data(GroupItemData_VerticalMargin).toInt();
-    int iMajorSpacing = data(GroupItemData_MajorSpacing).toInt();
+    int iMajorSpacing = data(GroupItemData_Spacing).toInt();
     int iFullHeaderHeight = m_minimumHeaderSize.height();
 
@@ -1842 +1821 @@
 
         /* Prepare variables: */
-        int iMinorSpacing = data(GroupItemData_MinorSpacing).toInt();
         int iEnterButtonWidth = m_enterButtonSize.width();
 
@@ -1848 +1826 @@
         int iHorizontalIndent = rect.right() - iHorizontalMargin;
         if (!isRoot())
-            iHorizontalIndent -= (iEnterButtonWidth + iMinorSpacing);
+            iHorizontalIndent -= iEnterButtonWidth;
 
         /* Should we draw machine count info? */
@@ -1868 +1846 @@
                       m_strInfoMachines);
 
-            iHorizontalIndent -= (m_pixmapSizeMachines.width() + iMinorSpacing);
+            iHorizontalIndent -= m_pixmapSizeMachines.width();
             int iMachinePixmapX = iHorizontalIndent;
             int iMachinePixmapY = m_pixmapSizeMachines.height() == iFullHeaderHeight ?
@@ -1878 +1856 @@
                         /* Pixmap to paint: */
                         m_machinesPixmap);
-
-            /* Indent between machines and groups: */
-            iHorizontalIndent -= iMinorSpacing;
         }
 
@@ -1901 +1876 @@
                       m_strInfoGroups);
 
-            iHorizontalIndent -= (m_pixmapSizeGroups.width() + iMinorSpacing);
+            iHorizontalIndent -= m_pixmapSizeGroups.width();
             int iGroupPixmapX = iHorizontalIndent;
             int iGroupPixmapY = m_pixmapSizeGroups.height() == iFullHeaderHeight ?

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

@@ -242 +242 @@
         GroupItemData_HorizonalMargin,
         GroupItemData_VerticalMargin,
-        GroupItemData_MajorSpacing,
-        GroupItemData_MinorSpacing,
+        GroupItemData_Spacing,
     };