Changeset 73997 in vbox for trunk/src

Timestamp:

Aug 31, 2018 10:45:01 AM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: VirtualBox Manager UI: Chooser pane re-styling: Group and Machine items: No need for child indent as well.

Location:

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

Files:

• UIChooserItemGroup.cpp (modified) (12 diffs)
• UIChooserItemMachine.cpp (modified) (1 diff)

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

@@ -820 +820 @@
         {
             /* Prepare variables: */
-            int iMajorSpacing = data(GroupItemData_Spacing).toInt();
+            int iSpacing = data(GroupItemData_Spacing).toInt();
             int iToggleButtonWidth = m_toggleButtonSize.width();
             /* Layout name-editor: */
-            int iNameEditorX = iHorizontalMargin + iToggleButtonWidth + iMajorSpacing;
+            int iNameEditorX = iHorizontalMargin + iToggleButtonWidth + iSpacing;
             int iNameEditorY = 1;
             m_pNameEditor->setPos(iNameEditorX, iNameEditorY);
@@ -844 +844 @@
     {
         /* Prepare variables: */
-        int iHorizontalIndent = isRoot() ? 0 : iHorizontalMargin;
         QRect geo = geometry().toRect();
         int iX = geo.x();
@@ -858 +857 @@
             int iMinimumHeight = pItem->minimumHeightHint();
             /* Set item position: */
-            pItem->setPos(iX + iHorizontalIndent, iY + iPreviousVerticalIndent);
+            pItem->setPos(iX, iY + iPreviousVerticalIndent);
             /* Set item size: */
-            pItem->resize(iWidth - 2 * iHorizontalIndent, iMinimumHeight);
+            pItem->resize(iWidth, iMinimumHeight);
             /* Relayout group: */
             pItem->updateLayout();
@@ -1286 +1285 @@
         case GroupItemData_HorizonalMargin: return QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize) / 4;
         case GroupItemData_VerticalMargin:  return QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize) / 4;
-        case GroupItemData_Spacing:    return QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize) / 2;
+        case GroupItemData_Spacing:         return QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize) / 2;
 
         /* Default: */
@@ -1470 +1469 @@
         if (fGroupOpened)
         {
-            /* Prepare variables: */
-            int iHorizontalMargin = data(GroupItemData_HorizonalMargin).toInt();
-
             /* We should take into spacing between header and body: */
             iProposedHeight += iVerticalMargin;
@@ -1478 +1474 @@
             foreach (UIChooserItem *pItem, items())
                 iProposedHeight += pItem->minimumHeightHint();
-            /* And bottom margin at last: */
-            iProposedHeight += iHorizontalMargin;
         }
 
@@ -1504 +1498 @@
     /* Prepare variables: */
     int iHorizontalMargin = data(GroupItemData_HorizonalMargin).toInt();
-    int iMajorSpacing = data(GroupItemData_Spacing).toInt();
+    int iSpacing = data(GroupItemData_Spacing).toInt();
     int iToggleButtonWidth = m_toggleButtonSize.width();
     int iEnterButtonWidth = m_enterButtonSize.width();
@@ -1522 +1516 @@
         iMaximumWidth -= iToggleButtonWidth;
     /* Spacing between button and name: */
-    iMaximumWidth -= iMajorSpacing;
+    iMaximumWidth -= iSpacing;
     if (isHovered())
     {
         /* Spacing between name and info: */
-        iMaximumWidth -= iMajorSpacing;
+        iMaximumWidth -= iSpacing;
         /* Group info width: */
         if (!m_groupItems.isEmpty())
@@ -1575 +1569 @@
 
     /* Prepare variables: */
-    int iMajorSpacing = data(GroupItemData_Spacing).toInt();
+    int iSpacing = data(GroupItemData_Spacing).toInt();
 
     /* Calculate minimum visible name size: */
@@ -1593 +1587 @@
         iHeaderWidth += m_toggleButtonSize.width();
     iHeaderWidth += /* Spacing between button and name: */
-                    iMajorSpacing +
+                    iSpacing +
                     /* Minimum name width: */
                     iMinimumNameWidth +
                     /* Spacing between name and info: */
-                    iMajorSpacing;
+                    iSpacing;
     /* Group info width: */
     if (!m_groupItems.isEmpty())
@@ -1777 +1771 @@
     int iHorizontalMargin = data(GroupItemData_HorizonalMargin).toInt();
     int iVerticalMargin = data(GroupItemData_VerticalMargin).toInt();
-    int iMajorSpacing = data(GroupItemData_Spacing).toInt();
+    int iSpacing = data(GroupItemData_Spacing).toInt();
     int iFullHeaderHeight = m_minimumHeaderSize.height();
 
@@ -1799 +1793 @@
     else
         iNameX += m_toggleButtonSize.width();
-    iNameX += iMajorSpacing;
+    iNameX += iSpacing;
     int iNameY = m_visibleNameSize.height() == iFullHeaderHeight ? iVerticalMargin :
                  iVerticalMargin + (iFullHeaderHeight - m_visibleNameSize.height()) / 2;

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

@@ -984 +984 @@
 
     pPainter->setPen(strokeColor);
-    pPainter->drawRect(rect);
+    pPainter->drawLine(rect.topLeft(), rect.topRight() + QPoint(1, 0));
+    pPainter->drawLine(rect.bottomLeft() + QPoint(0, 1), rect.bottomRight() + QPoint(1, 1));
     pPainter->restore();
 }