Changeset 74617 in vbox for trunk

Timestamp:

Oct 4, 2018 4:19:03 PM (6 years ago)

Author:

vboxsync

Message:

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

File:

• trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGroup.cpp (modified) (4 diffs)

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

@@ -1468 +1468 @@
                     iProposedHeight += iChildrenSpacing;
             }
-        }
-        /* Minus last spacing: */
-        iProposedHeight -= iChildrenSpacing;
+            /* Minus last spacing: */
+            iProposedHeight -= iChildrenSpacing;
+        }
 
         /* Finally, additional height during animation: */
@@ -1668 +1668 @@
         /* Calculate top rectangle: */
         QRect tRect = rect;
-        tRect.setBottom(tRect.top() + iFullHeaderHeight);
+        if (!m_fClosed)
+            tRect.setBottom(tRect.top() + iFullHeaderHeight - 1);
+
         /* Prepare top gradient: */
         QLinearGradient tGradient(tRect.bottomLeft(), tRect.topLeft());
         tGradient.setColorAt(1, headerColor.darker(animatedValue()));
         tGradient.setColorAt(0, headerColor.darker(headerDarkness()));
+
         /* Fill top rectangle: */
         pPainter->fillRect(tRect, tGradient);
@@ -1712 +1715 @@
     pPainter->save();
 
+    /* Prepare variables: */
+    const int iMargin = data(GroupItemData_VerticalMargin).toInt();
+    const int iFullHeaderHeight = 2 * iMargin + m_minimumHeaderSize.height();
+
     /* Prepare color: */
-    QPalette pal = palette();
-    QColor strokeColor;
-
-    strokeColor = pal.color(QPalette::Active, QPalette::Mid).lighter(155);
+    const QPalette pal = palette();
+    const QColor strokeColor = pal.color(QPalette::Active,
+                                         model()->currentItems().contains(this) ?
+                                         QPalette::Highlight : QPalette::Midlight).darker(headerDarkness() + 10);
 
     /* Create/assign pen: */
@@ -1723 +1730 @@
     pPainter->setPen(pen);
 
+    /* Calculate top rectangle: */
+    QRect tRect = rect;
+    if (!m_fClosed)
+        tRect.setBottom(tRect.top() + iFullHeaderHeight - 1);
+
     /* Draw borders: */
-    pPainter->drawLine(rect.topLeft(),    rect.topRight() + QPoint(1, 0));
-    pPainter->drawLine(rect.bottomLeft(), rect.bottomRight() + QPoint(1, 0));
-    pPainter->drawLine(rect.topLeft(),    rect.bottomLeft());
+    pPainter->drawLine(tRect.topLeft(),    tRect.topRight()    + QPoint(1, 0));
+    pPainter->drawLine(tRect.bottomLeft(), tRect.bottomRight() + QPoint(1, 0));
+    pPainter->drawLine(tRect.topLeft(),    tRect.bottomLeft());
 
     /* Restore painter: */