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

Timestamp:

Sep 6, 2018 10:37:46 AM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: VirtualBox Manager UI: Details pane re-styling: Syncing margins and spacings with Chooser pane; let the System element get spare vertical space if any.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/manager/details

Files:

• UIDetailsGroup.cpp (modified) (6 diffs)
• UIDetailsSet.cpp (modified) (7 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsGroup.cpp

@@ -105 +105 @@
 {
     /* Prepare variables: */
-    int iMargin = data(GroupData_Margin).toInt();
-    int iSpacing = data(GroupData_Spacing).toInt();
-    int iMaximumWidth = (int)geometry().width() - 2 * iMargin;
+    const int iMargin = data(GroupData_Margin).toInt();
+    const int iSpacing = data(GroupData_Spacing).toInt();
+    const int iMaximumWidth = geometry().size().toSize().width();
     int iVerticalIndent = iMargin;
 
@@ -118 +118 @@
                 continue;
         /* Move set: */
-        pItem->setPos(iMargin, iVerticalIndent);
+        pItem->setPos(0, iVerticalIndent);
         /* Resize set: */
-        int iWidth = iMaximumWidth;
-        pItem->resize(iWidth, pItem->minimumHeightHint());
+        pItem->resize(iMaximumWidth, pItem->minimumHeightHint());
         /* Layout set content: */
         pItem->updateLayout();
@@ -132 +131 @@
 {
     /* Prepare variables: */
-    int iMargin = data(GroupData_Margin).toInt();
     int iMinimumWidthHint = 0;
 
@@ -149 +147 @@
     }
 
-    /* Add two margins finally: */
-    if (fHasItems)
-        iMinimumWidthHint += 2 * iMargin;
-
     /* Return result: */
     return iMinimumWidthHint;
@@ -160 +154 @@
 {
     /* Prepare variables: */
-    int iMargin = data(GroupData_Margin).toInt();
-    int iSpacing = data(GroupData_Spacing).toInt();
+    const int iMargin = data(GroupData_Margin).toInt();
+    const int iSpacing = data(GroupData_Spacing).toInt();
     int iMinimumHeightHint = 0;
+    bool fHasItems = false;
 
     /* For each the set we have: */
-    bool fHasItems = false;
     foreach (UIDetailsItem *pItem, items())
     {
@@ -307 +301 @@
         /* Layout hints: */
         case GroupData_Margin: return QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize) / 6;
-        case GroupData_Spacing: return QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize) / 2;
+        case GroupData_Spacing: return QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize) / 6;
         /* Default: */
         default: break;

trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsSet.cpp

@@ -300 +300 @@
 {
     /* Prepare variables: */
-    int iMargin = data(SetData_Margin).toInt();
-    int iSpacing = data(SetData_Spacing).toInt();
-    int iMaximumWidth = geometry().size().toSize().width();
-    int iVerticalIndent = iMargin;
+    const int iMargin = data(SetData_Margin).toInt();
+    const int iSpacing = data(SetData_Spacing).toInt();
+    const int iMaximumWidth = geometry().size().toSize().width();
+    int iVerticalIndent = 0;
 
     /* Layout all the elements: */
@@ -329 +329 @@
             {
                 /* Move element: */
-                pElement->setPos(iMargin, iVerticalIndent);
+                pElement->setPos(0, iVerticalIndent);
                 /* Calculate required width: */
-                int iWidth = iMaximumWidth - 2 * iMargin;
+                int iWidth = iMaximumWidth;
                 if (pElement->elementType() == DetailsElementType_General ||
                     pElement->elementType() == DetailsElementType_System)
@@ -345 +345 @@
                 /* Acquire required height: */
                 int iHeight = pElement->minimumHeightHint();
+                if (pElement->elementType() == DetailsElementType_System)
+                    if (UIDetailsElement *pPreviewElement = element(DetailsElementType_Preview))
+                        if (pPreviewElement->isVisible())
+                        {
+                            int iSpareHeight = pPreviewElement->minimumHeightHint();
+                            if (UIDetailsElement *pGeneralElement = element(DetailsElementType_General))
+                                if (pGeneralElement->isVisible())
+                                    iSpareHeight -= (iSpacing + pGeneralElement->minimumHeightHint());
+                            iHeight = qMax(iHeight, iSpareHeight);
+                        }
                 /* If element height is wrong: */
                 if (pElement->geometry().height() != iHeight)
@@ -363 +373 @@
                 int iHeight = pElement->minimumHeightHint();
                 /* Move element: */
-                pElement->setPos(iMaximumWidth - iMargin - iWidth, iMargin);
+                pElement->setPos(iMaximumWidth - iWidth, iMargin);
                 /* Resize element: */
                 pElement->resize(iWidth, iHeight);
@@ -384 +394 @@
 
     /* Prepare variables: */
-    int iMargin = data(SetData_Margin).toInt();
-    int iSpacing = data(SetData_Spacing).toInt();
+    const int iSpacing = data(SetData_Spacing).toInt();
     int iMinimumWidthHint = 0;
 
@@ -428 +437 @@
     }
 
-    /* And two margins finally: */
-    iMinimumWidthHint += 2 * iMargin;
-
     /* Return result: */
     return iMinimumWidthHint;
@@ -546 +552 @@
         /* Layout hints: */
         case SetData_Margin: return 0;
-        case SetData_Spacing: return QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize) / 5;
+        case SetData_Spacing: return QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize) / 6;
         /* Default: */
         default: break;