Changeset 43825 in vbox for trunk

Timestamp:

Nov 7, 2012 10:31:08 AM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: VM group UI: Get rid of root-item indent hardcoding.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser

Files:

• UIGChooserItemGroup.cpp (modified) (16 diffs)
• UIGChooserItemGroup.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserItemGroup.cpp

@@ -367 +367 @@
         case GroupItemData_MajorSpacing: return 10;
         case GroupItemData_MinorSpacing: return 3;
+        case GroupItemData_RootIndent: return 2;
         /* Texts: */
         case GroupItemData_Name: return m_strVisibleName;
@@ -476 +477 @@
     int iMajorSpacing = data(GroupItemData_MajorSpacing).toInt();
     int iMinorSpacing = data(GroupItemData_MinorSpacing).toInt();
+    int iRootIndent = data(GroupItemData_RootIndent).toInt();
     int iToggleButtonWidth = data(GroupItemData_ToggleButtonSize).toSize().width();
     int iEnterButtonWidth = data(GroupItemData_EnterButtonSize).toSize().width();
@@ -486 +488 @@
 
     /* Left margin: */
+    if (isRoot())
+        iMaximumWidth -= iRootIndent;
     iMaximumWidth -= iHorizontalMargin;
     /* Button width: */
@@ -497 +501 @@
     {
         /* Spacing between name and info: */
-        iMaximumWidth -= iMinorSpacing;
+        iMaximumWidth -= iMajorSpacing;
         /* Group info width: */
         if (!m_groupItems.isEmpty())
@@ -510 +514 @@
     /* Right margin: */
     iMaximumWidth -= iHorizontalMargin;
+    if (isRoot())
+        iMaximumWidth -= iRootIndent;
 
     /* Recache visible name: */
@@ -555 +561 @@
                     iMinimumNameWidth +
                     /* Spacing between name and info: */
-                    iMinorSpacing;
+                    iMajorSpacing;
     /* Group info width: */
     if (!m_groupItems.isEmpty())
@@ -936 +942 @@
     int iMinorSpacing = data(GroupItemData_MinorSpacing).toInt();
     int iFullHeaderHeight = data(GroupItemData_FullHeaderSize).toSize().height();
+    int iRootIndent = data(GroupItemData_RootIndent).toInt();
     int iPreviousVerticalIndent = 0;
 
@@ -945 +952 @@
         {
             /* Prepare body indent: */
-            iPreviousVerticalIndent = 2;
+            iPreviousVerticalIndent = iRootIndent;
         }
         /* Header (non-main root-item): */
@@ -962 +969 @@
                 int iExitButtonHeight = data(GroupItemData_ExitButtonSize).toSize().height();
                 /* Layout exit-button: */
-                int iExitButtonX = iHorizontalMargin + 2;
+                int iExitButtonX = iHorizontalMargin + iRootIndent;
                 int iExitButtonY = iExitButtonHeight == iFullHeaderHeight ? iVerticalMargin :
                                    iVerticalMargin + (iFullHeaderHeight - iExitButtonHeight) / 2;
@@ -1041 +1048 @@
     {
         /* Prepare variables: */
-        int iHorizontalIndent = isRoot() ? 2 : iHorizontalMargin;
+        int iHorizontalIndent = isRoot() ? iRootIndent : iHorizontalMargin;
         QRect geo = geometry().toRect();
         int iX = geo.x();
@@ -1070 +1077 @@
     /* Prepare variables: */
     int iHorizontalMargin = data(GroupItemData_HorizonalMargin).toInt();
+    int iRootIndent = data(GroupItemData_RootIndent).toInt();
     int iFullHeaderWidth = data(GroupItemData_FullHeaderSize).toSize().width();
 
@@ -1083 +1091 @@
     {
         /* Prepare variables: */
-        int iHorizontalIndent = isRoot() ? 2 : iHorizontalMargin;
+        int iHorizontalIndent = isRoot() ? iRootIndent : iHorizontalMargin;
         /* We have to make sure that we had taken into account: */
         foreach (UIGChooserItem *pItem, items())
@@ -1438 +1446 @@
             /* Prepare variables: */
             int iMargin = data(GroupItemData_VerticalMargin).toInt();
+            int iRootIndent = data(GroupItemData_RootIndent).toInt();
             int iHeaderHeight = data(GroupItemData_FullHeaderSize).toSize().height();
             int iFullHeaderHeight = 2 * iMargin + iHeaderHeight;
@@ -1444 +1453 @@
             /* Add clipping: */
             QPainterPath path;
-            path.moveTo(2, 0);
+            path.moveTo(iRootIndent, 0);
             path.lineTo(path.currentPosition().x(), iFullHeaderHeight - 10);
             path.arcTo(QRectF(path.currentPosition(), QSizeF(20, 20)).translated(0, -10), 180, 90);
-            path.lineTo(rect.width() - 10 - 2, path.currentPosition().y());
+            path.lineTo(rect.width() - 10 - iRootIndent, path.currentPosition().y());
             path.arcTo(QRectF(path.currentPosition(), QSizeF(20, 20)).translated(-10, -20), 270, 90);
             path.lineTo(path.currentPosition().x(), 0);
@@ -1546 +1555 @@
     int iVerticalMargin = data(GroupItemData_VerticalMargin).toInt();
     int iMajorSpacing = data(GroupItemData_MajorSpacing).toInt();
+    int iRootIndent = data(GroupItemData_RootIndent).toInt();
     QSize toggleButtonSize = data(GroupItemData_ToggleButtonSize).toSize();
     QSize exitButtonSize = data(GroupItemData_ExitButtonSize).toSize();
@@ -1569 +1579 @@
     int iNameX = iHorizontalMargin;
     if (isRoot())
-        iNameX += 2 + exitButtonSize.width();
+        iNameX += iRootIndent + exitButtonSize.width();
     else
         iNameX += toggleButtonSize.width();

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserItemGroup.h

@@ -108 +108 @@
         GroupItemData_MajorSpacing,
         GroupItemData_MinorSpacing,
+        GroupItemData_RootIndent,
         /* Text: */
         GroupItemData_Name,