Changeset 74393 in vbox

Timestamp:

Sep 20, 2018 5:05:11 PM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

125215

Message:

FE/Qt: VirtualBox Manager: Chooser pane: A bit of fixes for group/machine element frame.

Location:

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

Files:

• UIChooserItemGroup.cpp (modified) (15 diffs)
• UIChooserItemGroup.h (modified) (1 diff)
• UIChooserItemMachine.cpp (modified) (4 diffs)

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

@@ -349 +349 @@
 void UIChooserItemGroup::paint(QPainter *pPainter, const QStyleOptionGraphicsItem *pOptions, QWidget* /* pWidget = 0 */)
 {
-    /* Setup: */
-    pPainter->setRenderHint(QPainter::Antialiasing);
-
     /* Paint background: */
     paintBackground(pPainter, pOptions->rect);
-
     /* Paint frame: */
     paintFrameRectangle(pPainter, pOptions->rect);
-
     /* Paint header: */
     paintHeader(pPainter, pOptions->rect);
@@ -820 +815 @@
         {
             /* Prepare variables: */
-            int iSpacing = data(GroupItemData_Spacing).toInt();
+            int iHeaderSpacing = data(GroupItemData_HeaderSpacing).toInt();
             int iToggleButtonWidth = m_toggleButtonSize.width();
             /* Layout name-editor: */
-            int iNameEditorX = iHorizontalMargin + iToggleButtonWidth + iSpacing;
+            int iNameEditorX = iHorizontalMargin + iToggleButtonWidth + iHeaderSpacing;
             int iNameEditorY = 1;
             m_pNameEditor->setPos(iNameEditorX, iNameEditorY);
@@ -844 +839 @@
     {
         /* Prepare variables: */
+        const int iChildrenSpacing = data(GroupItemData_ChildrenSpacing).toInt();
         QRect geo = geometry().toRect();
         int iX = geo.x();
@@ -863 +859 @@
             pItem->updateLayout();
             /* Update indent for next items: */
-            iPreviousVerticalIndent += iMinimumHeight;
+            iPreviousVerticalIndent += (iMinimumHeight + iChildrenSpacing);
         }
     }
@@ -1275 +1271 @@
         case GroupItemData_HorizonalMargin: return QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize) / 4;
         case GroupItemData_VerticalMargin:  return QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize) / 2;
-        case GroupItemData_Spacing:         return QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize) / 2;
+        case GroupItemData_HeaderSpacing:   return QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize) / 2;
+        case GroupItemData_ChildrenSpacing: return 1;
         case GroupItemData_ParentIndent:    return QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize) / 3;
 
@@ -1451 +1448 @@
     {
         /* Prepare variables: */
-        int iVerticalMargin = data(GroupItemData_VerticalMargin).toInt();
+        const int iVerticalMargin = data(GroupItemData_VerticalMargin).toInt();
+        const int iChildrenSpacing = data(GroupItemData_ChildrenSpacing).toInt();
 
         /* Group-item header have 2 margins - top and bottom: */
@@ -1463 +1461 @@
             /* And every existing child height: */
             foreach (UIChooserItem *pItem, items())
-                iProposedHeight += pItem->minimumHeightHint();
-        }
+                iProposedHeight += (pItem->minimumHeightHint() + iChildrenSpacing);
+        }
+        /* Minus last spacing: */
+        iProposedHeight -= iChildrenSpacing;
 
         /* Finally, additional height during animation: */
@@ -1488 +1488 @@
     /* Prepare variables: */
     int iHorizontalMargin = data(GroupItemData_HorizonalMargin).toInt();
-    int iSpacing = data(GroupItemData_Spacing).toInt();
+    int iHeaderSpacing = data(GroupItemData_HeaderSpacing).toInt();
     int iToggleButtonWidth = m_toggleButtonSize.width();
     int iEnterButtonWidth = m_enterButtonSize.width();
@@ -1506 +1506 @@
         iMaximumWidth -= iToggleButtonWidth;
     /* Spacing between button and name: */
-    iMaximumWidth -= iSpacing;
+    iMaximumWidth -= iHeaderSpacing;
     if (isHovered())
     {
         /* Spacing between name and info: */
-        iMaximumWidth -= iSpacing;
+        iMaximumWidth -= iHeaderSpacing;
         /* Group info width: */
         if (!m_groupItems.isEmpty())
@@ -1559 +1559 @@
 
     /* Prepare variables: */
-    int iSpacing = data(GroupItemData_Spacing).toInt();
+    int iHeaderSpacing = data(GroupItemData_HeaderSpacing).toInt();
 
     /* Calculate minimum visible name size: */
@@ -1577 +1577 @@
         iHeaderWidth += m_toggleButtonSize.width();
     iHeaderWidth += /* Spacing between button and name: */
-                    iSpacing +
+                    iHeaderSpacing +
                     /* Minimum name width: */
                     iMinimumNameWidth +
                     /* Spacing between name and info: */
-                    iSpacing;
+                    iHeaderSpacing;
     /* Group info width: */
     if (!m_groupItems.isEmpty())
@@ -1703 +1703 @@
         return;
 
-    /* Simple frame: */
+    /* Save painter: */
     pPainter->save();
+
+    /* Prepare color: */
     QPalette pal = palette();
     QColor strokeColor;
@@ -1710 +1712 @@
     strokeColor = pal.color(QPalette::Active, QPalette::Mid).lighter(155);
 
-    pPainter->setPen(strokeColor);
-    pPainter->drawLine(rect.topLeft(), rect.topRight() + QPoint(1, 0));
-    pPainter->drawLine(rect.bottomLeft() + QPoint(0, 1), rect.bottomRight() + QPoint(1, 1));
+    /* Create/assign pen: */
+    QPen pen(strokeColor);
+    pen.setWidth(0);
+    pPainter->setPen(pen);
+
+    /* 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());
+
+    /* Restore painter: */
     pPainter->restore();
 }
@@ -1725 +1735 @@
     const int iHorizontalMargin = data(GroupItemData_HorizonalMargin).toInt();
     const int iVerticalMargin = data(GroupItemData_VerticalMargin).toInt();
-    const int iSpacing = data(GroupItemData_Spacing).toInt();
+    const int iHeaderSpacing = data(GroupItemData_HeaderSpacing).toInt();
     const int iParentIndent = data(GroupItemData_ParentIndent).toInt();
     const int iFullHeaderHeight = m_minimumHeaderSize.height();
@@ -1748 +1758 @@
     else
         iNameX += m_toggleButtonSize.width();
-    iNameX += iSpacing;
+    iNameX += iHeaderSpacing;
     int iNameY = m_visibleNameSize.height() == iFullHeaderHeight ? iVerticalMargin :
                  iVerticalMargin + (iFullHeaderHeight - m_visibleNameSize.height()) / 2;

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

@@ -242 +242 @@
         GroupItemData_HorizonalMargin,
         GroupItemData_VerticalMargin,
-        GroupItemData_Spacing,
+        GroupItemData_HeaderSpacing,
+        GroupItemData_ChildrenSpacing,
         GroupItemData_ParentIndent,
     };

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

@@ -247 +247 @@
 void UIChooserItemMachine::paint(QPainter *pPainter, const QStyleOptionGraphicsItem *pOption, QWidget* /* pWidget = 0 */)
 {
-    /* Setup: */
-    pPainter->setRenderHint(QPainter::Antialiasing);
-
     /* Paint decorations: */
     paintDecorations(pPainter, pOption);
@@ -592 +589 @@
     m_iHoverLightnessMax = 120;
 #else /* VBOX_WS_MAC */
-    m_iHighlightLightnessMin = 120;
+    m_iHighlightLightnessMin = 130;
     m_iHighlightLightnessMax = 160;
-    m_iHoverLightnessMin = 155;
-    m_iHoverLightnessMax = 175;
+    m_iHoverLightnessMin = 160;
+    m_iHoverLightnessMax = 190;
 #endif /* !VBOX_WS_MAC */
 
@@ -970 +967 @@
 void UIChooserItemMachine::paintFrameRectangle(QPainter *pPainter, const QRect &rect)
 {
-    /* Simple frame: */
+    /* Save painter: */
     pPainter->save();
+
+    /* Prepare color: */
     QPalette pal = palette();
     QColor strokeColor;
@@ -977 +976 @@
     /* Selection frame: */
     if (model()->currentItems().contains(this))
-        strokeColor = pal.color(QPalette::Active, QPalette::Mid).darker(110);
+        strokeColor = pal.color(QPalette::Active, QPalette::Highlight).lighter(m_iHighlightLightnessMin - 40);
+    /* Hovering frame: */
+    else if (isHovered())
+        strokeColor = pal.color(QPalette::Active, QPalette::Highlight).lighter(m_iHoverLightnessMin - 50);
     /* Default frame: */
     else
-        strokeColor = pal.color(QPalette::Active, QPalette::Midlight).darker(110);
-
-    pPainter->setPen(strokeColor);
-    pPainter->drawLine(rect.topLeft(), rect.topRight() + QPoint(1, 0));
-    pPainter->drawLine(rect.bottomLeft() + QPoint(0, 1), rect.bottomRight() + QPoint(1, 1));
+        strokeColor = pal.color(QPalette::Active, QPalette::Mid).lighter(m_iHoverLightnessMin);
+
+    /* Create/assign pen: */
+    QPen pen(strokeColor);
+    pen.setWidth(0);
+    pPainter->setPen(pen);
+
+    /* 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());
+
+    /* Restore painter: */
     pPainter->restore();
 }