Changeset 74599 in vbox for trunk/src/VBox

Timestamp:

Oct 3, 2018 2:48:14 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9241: VirtualBox Manager: Sync tool item look&feel with chooser machine item.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/manager/tools

Files:

• UIToolsItem.cpp (modified) (5 diffs)
• UIToolsItem.h (modified) (1 diff)
• UIToolsModel.cpp (modified) (6 diffs)
• UIToolsModel.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsItem.cpp

@@ -194 +194 @@
     , m_iHoveredValue(90)
     , m_iAnimatedValue(m_iDefaultValue)
+    , m_iDefaultLightnessMin(0)
+    , m_iDefaultLightnessMax(0)
     , m_iHoverLightnessMin(0)
     , m_iHoverLightnessMax(0)
@@ -433 +435 @@
     m_iHighlightLightnessMin = 105;
     m_iHighlightLightnessMax = 115;
-    m_iHoverLightnessMin = 110;
-    m_iHoverLightnessMax = 120;
+    m_iHoverLightnessMin = 115;
+    m_iHoverLightnessMax = 125;
+    m_iDefaultLightnessMin = 145;
+    m_iDefaultLightnessMax = 155;
 #else /* VBOX_WS_MAC */
     m_iHighlightLightnessMin = 130;
@@ -440 +444 @@
     m_iHoverLightnessMin = 160;
     m_iHoverLightnessMax = 190;
+    m_iDefaultLightnessMin = 160;
+    m_iDefaultLightnessMax = 190;
 #endif /* !VBOX_WS_MAC */
 
@@ -730 +736 @@
         /* Draw gradient: */
         QLinearGradient bgGrad(rectangle.topLeft(), rectangle.bottomLeft());
-        bgGrad.setColorAt(0, backgroundColor.lighter(m_iHoverLightnessMax));
-        bgGrad.setColorAt(1, backgroundColor.lighter(m_iHoverLightnessMin));
+        bgGrad.setColorAt(0, backgroundColor.lighter(m_iDefaultLightnessMax));
+        bgGrad.setColorAt(1, backgroundColor.lighter(m_iDefaultLightnessMin));
         pPainter->fillRect(rectangle, bgGrad);
     }
@@ -756 +762 @@
     /* Default frame: */
     else
-        strokeColor = pal.color(QPalette::Active, QPalette::Mid).lighter(m_iHoverLightnessMin);
+        strokeColor = pal.color(QPalette::Active, QPalette::Mid).lighter(m_iDefaultLightnessMin);
 
     /* Create/assign pen: */

trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsItem.h

@@ -279 +279 @@
         int                 m_iAnimatedValue;
 
+        /** Holds minimum default lightness tone. */
+        int  m_iDefaultLightnessMin;
+        /** Holds maximum default lightness tone. */
+        int  m_iDefaultLightnessMax;
         /** Holds minimum hover lightness tone. */
         int  m_iHoverLightnessMin;

trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsModel.cpp

@@ -290 +290 @@
 void UIToolsModel::updateLayout()
 {
-    /* Initialize variables: */
+    /* Prepare variables: */
+    const int iMargin = data(ToolsModelData_Margin).toInt();
+    const int iSpacing = data(ToolsModelData_Spacing).toInt();
     const QSize viewportSize = scene()->views()[0]->viewport()->size();
     const int iViewportWidth = viewportSize.width();
-    int iVerticalIndent = 0;
+    int iVerticalIndent = iMargin;
 
     /* Layout the children: */
@@ -306 +308 @@
 
         /* Set item position: */
-        pItem->setPos(0, iVerticalIndent);
+        pItem->setPos(iMargin, iVerticalIndent);
         /* Set root-item size: */
         pItem->resize(iViewportWidth, pItem->minimumHeightHint());
@@ -312 +314 @@
         pItem->show();
         /* Advance vertical indent: */
-        iVerticalIndent += pItem->minimumHeightHint();
+        iVerticalIndent += (pItem->minimumHeightHint() + iSpacing);
     }
 }
@@ -324 +326 @@
 void UIToolsModel::sltItemMinimumWidthHintChanged()
 {
+    /* Prepare variables: */
+    const int iMargin = data(ToolsModelData_Margin).toInt();
+
     /* Calculate maximum horizontal width: */
     int iMinimumWidthHint = 0;
+    iMinimumWidthHint += 2 * iMargin;
     foreach (UIToolsItem *pItem, items())
         iMinimumWidthHint = qMax(iMinimumWidthHint, pItem->minimumWidthHint());
+
+    /* Notify listeners: */
     emit sigItemMinimumWidthHintChanged(iMinimumWidthHint);
 }
@@ -333 +341 @@
 void UIToolsModel::sltItemMinimumHeightHintChanged()
 {
+    /* Prepare variables: */
+    const int iMargin = data(ToolsModelData_Margin).toInt();
+    const int iSpacing = data(ToolsModelData_Spacing).toInt();
+
     /* Calculate summary vertical height: */
     int iMinimumHeightHint = 0;
+    iMinimumHeightHint += 2 * iMargin;
     foreach (UIToolsItem *pItem, items())
         if (pItem->isVisible())
-            iMinimumHeightHint += pItem->minimumHeightHint();
+            iMinimumHeightHint += (pItem->minimumHeightHint() + iSpacing);
+    iMinimumHeightHint -= iSpacing;
+
+    /* Notify listeners: */
     emit sigItemMinimumHeightHintChanged(iMinimumHeightHint);
 }
@@ -535 +551 @@
     /* Cleanup scene: */
     cleanupScene();
+}
+
+QVariant UIToolsModel::data(int iKey) const
+{
+    /* Provide other members with required data: */
+    switch (iKey)
+    {
+        /* Layout hints: */
+        case ToolsModelData_Margin:  return 0;
+        case ToolsModelData_Spacing: return 1;
+
+        /* Default: */
+        default: break;
+    }
+    return QVariant();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsModel.h

@@ -181 +181 @@
 
 private:
+
+    /** Data field types. */
+    enum ToolsModelData
+    {
+        /* Layout hints: */
+        ToolsModelData_Margin,
+        ToolsModelData_Spacing,
+    };
 
     /** @name Prepare/Cleanup cascade.
@@ -211 +219 @@
     /** @name General stuff.
       * @{ */
+        /** Returns abstractly stored data value for certain @a iKey. */
+        QVariant data(int iKey) const;
+
         /** Returns @a enmType string representation.
           * @todo move to UIConverter one day .. */