Changeset 43824 in vbox for trunk/src

Timestamp:

Nov 7, 2012 9:31:58 AM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: VM group UI: Group-item header layout recalculation.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserItemGroup.cpp (modified) (11 diffs)

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

@@ -475 +475 @@
     int iHorizontalMargin = data(GroupItemData_HorizonalMargin).toInt();
     int iMajorSpacing = data(GroupItemData_MajorSpacing).toInt();
+    int iMinorSpacing = data(GroupItemData_MinorSpacing).toInt();
     int iToggleButtonWidth = data(GroupItemData_ToggleButtonSize).toSize().width();
     int iEnterButtonWidth = data(GroupItemData_EnterButtonSize).toSize().width();
@@ -496 +497 @@
     {
         /* Spacing between name and info: */
-        iMaximumWidth -= iMajorSpacing;
+        iMaximumWidth -= iMinorSpacing;
         /* Group info width: */
         if (!m_groupItems.isEmpty())
@@ -503 +504 @@
         if (!m_machineItems.isEmpty())
             iMaximumWidth -= (iMachinePixmapWidth + iMachineCountTextWidth);
-    }
-    /* Button width: */
-    if (!isRoot() && isHovered())
-        iMaximumWidth -= iEnterButtonWidth;
+        /* Spacing + button width: */
+        if (!isRoot())
+            iMaximumWidth -= (iMinorSpacing + iEnterButtonWidth);
+    }
     /* Right margin: */
     iMaximumWidth -= iHorizontalMargin;
@@ -525 +526 @@
     /* Prepare variables: */
     int iMajorSpacing = data(GroupItemData_MajorSpacing).toInt();
+    int iMinorSpacing = data(GroupItemData_MinorSpacing).toInt();
     QSize exitButtonSize = data(GroupItemData_ExitButtonSize).toSize();
     QSize toggleButtonSize = data(GroupItemData_ToggleButtonSize).toSize();
@@ -553 +555 @@
                     iMinimumNameWidth +
                     /* Spacing between name and info: */
-                    iMajorSpacing;
+                    iMinorSpacing;
     /* Group info width: */
     if (!m_groupItems.isEmpty())
@@ -560 +562 @@
     if (!m_machineItems.isEmpty())
         iHeaderWidth += (machinePixmapSize.width() + machineCountTextSize.width());
-    /* Button width: */
+    /* Spacing + button width: */
     if (!isRoot())
-        iHeaderWidth += enterButtonSize.width();
+        iHeaderWidth += (iMinorSpacing + enterButtonSize.width());
 
     /* Search for maximum height: */
@@ -1422 +1424 @@
                                    QPalette::Highlight : QPalette::Window);
 
-    /* Root item: */
+    /* Root-item: */
     if (isRoot())
     {
-        /* Main root item: */
+        /* Main root-item: */
         if (isMainRoot())
         {
@@ -1431 +1433 @@
             pPainter->fillRect(rect, QColor(240, 240, 240));
         }
+        /* Non-main root-item: */
         else
         {
@@ -1461 +1464 @@
         }
     }
-    /* Non-root item: */
+    /* Non-root-item: */
     else
     {
@@ -1535 +1538 @@
 void UIGChooserItemGroup::paintHeader(QPainter *pPainter, const QRect &rect)
 {
-    /* Non for main root: */
+    /* Not for main root: */
     if (isMainRoot())
         return;
@@ -1564 +1567 @@
 
     /* Paint name: */
-    int iNameX = iHorizontalMargin + iMajorSpacing;
-    if (!isRoot())
+    int iNameX = iHorizontalMargin;
+    if (isRoot())
+        iNameX += 2 + exitButtonSize.width();
+    else
         iNameX += toggleButtonSize.width();
-    else if (!isMainRoot())
-        iNameX += 2 + exitButtonSize.width();
+    iNameX += iMajorSpacing;
     int iNameY = nameSize.height() == iFullHeaderHeight ? iVerticalMargin :
                  iVerticalMargin + (iFullHeaderHeight - nameSize.height()) / 2;