Changeset 74690 in vbox for trunk

Timestamp:

Oct 8, 2018 4:30:31 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9241: VirtualBox Manager: Details pane: No layout margin/spacing for UIDetailsGroup at all (s.a. r125600).

Location:

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

Files:

• UIDetailsGroup.cpp (modified) (5 diffs)
• UIDetailsGroup.h (modified) (1 diff)

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

@@ -105 +105 @@
 {
     /* Prepare variables: */
-    const int iSpacing = data(GroupData_Spacing).toInt();
     const int iMaximumWidth = geometry().size().toSize().width();
     int iVerticalIndent = 0;
@@ -123 +122 @@
         pItem->updateLayout();
         /* Advance indent: */
-        iVerticalIndent += (pItem->minimumHeightHint() + iSpacing);
+        iVerticalIndent += pItem->minimumHeightHint();
     }
 }
@@ -153 +152 @@
 {
     /* Prepare variables: */
-    const int iMargin = data(GroupData_Margin).toInt();
-    const int iSpacing = data(GroupData_Spacing).toInt();
     int iMinimumHeightHint = 0;
     bool fHasItems = false;
@@ -166 +163 @@
                 continue;
         /* And take into account all the others: */
-        iMinimumHeightHint += (pItem->minimumHeightHint() + iSpacing);
+        iMinimumHeightHint += pItem->minimumHeightHint();
         if (!fHasItems)
             fHasItems = true;
     }
-    /* Minus last spacing: */
-    if (fHasItems)
-        iMinimumHeightHint -= iSpacing;
-
-    /* Add two margins finally: */
-    if (fHasItems)
-        iMinimumHeightHint += 2 * iMargin;
 
     /* Return result: */
@@ -293 +283 @@
 }
 
-QVariant UIDetailsGroup::data(int iKey) const
-{
-    /* Provide other members with required data: */
-    switch (iKey)
-    {
-        /* Layout hints: */
-        case GroupData_Margin: return QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize) / 6;
-        case GroupData_Spacing: return QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize) / 6;
-        /* Default: */
-        default: break;
-    }
-    return QVariant();
-}
-
 void UIDetailsGroup::paintBackground(QPainter *pPainter, const QStyleOptionGraphicsItem *pOptions) const
 {

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

@@ -126 +126 @@
 private:
 
-    /** Data field types. */
-    enum GroupItemData
-    {
-        /* Layout hints: */
-        GroupData_Margin,
-        GroupData_Spacing
-    };
-
     /** @name Prepare/cleanup cascade.
       * @{ */
         /** Prepares connections. */
         void prepareConnections();
-    /** @} */
-
-    /** @name Item stuff.
-      * @{ */
-        /** Returns abstractly stored data value for certain @a iKey. */
-        QVariant data(int iKey) const;
     /** @} */