Changeset 74717 in vbox for trunk

Timestamp:

Oct 9, 2018 1:44:30 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9241: VirtualBox Manager: Chooser pane: Sync Group item frame with machine/global items.

Location:

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

Files:

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

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

@@ -349 +349 @@
 void UIChooserItemGroup::paint(QPainter *pPainter, const QStyleOptionGraphicsItem *pOptions, QWidget* /* pWidget = 0 */)
 {
+    /* Acquire rectangle: */
+    const QRect rectangle = pOptions->rect;
+
     /* Paint background: */
-    paintBackground(pPainter, pOptions->rect);
+    paintBackground(pPainter, rectangle);
     /* Paint frame: */
-    paintFrameRectangle(pPainter, pOptions->rect);
+    paintFrame(pPainter, rectangle);
     /* Paint header: */
-    paintHeader(pPainter, pOptions->rect);
+    paintHeader(pPainter, rectangle);
 }
 
@@ -859 +862 @@
             pItem->updateLayout();
             /* Advance indent for next items: */
-            iPreviousVerticalIndent += iMinimumHeight;
-            if (pItem->type() != UIChooserItemType_Global)
-                iPreviousVerticalIndent += iChildrenSpacing;
+            iPreviousVerticalIndent += (iMinimumHeight + iChildrenSpacing);
         }
     }
@@ -1464 +1465 @@
             foreach (UIChooserItem *pItem, items())
             {
-                iProposedHeight += pItem->minimumHeightHint();
-                if (pItem->type() != UIChooserItemType_Global)
-                    iProposedHeight += iChildrenSpacing;
+                iProposedHeight += (pItem->minimumHeightHint() + iChildrenSpacing);
             }
             /* Minus last spacing: */
@@ -1706 +1705 @@
 }
 
-void UIChooserItemGroup::paintFrameRectangle(QPainter *pPainter, const QRect &rect)
+void UIChooserItemGroup::paintFrame(QPainter *pPainter, const QRect &rectangle)
 {
     /* Not for roots: */
@@ -1731 +1730 @@
 
     /* Calculate top rectangle: */
-    QRect tRect = rect;
+    QRect topRect = rectangle;
     if (!m_fClosed)
-        tRect.setBottom(tRect.top() + iFullHeaderHeight - 1);
+        topRect.setBottom(topRect.top() + iFullHeaderHeight - 1);
 
     /* Draw borders: */
-    pPainter->drawLine(tRect.topLeft(),    tRect.topRight()    + QPoint(1, 0));
-    pPainter->drawLine(tRect.bottomLeft(), tRect.bottomRight() + QPoint(1, 0));
-    pPainter->drawLine(tRect.topLeft(),    tRect.bottomLeft());
+    pPainter->drawLine(topRect.bottomLeft(), topRect.bottomRight() + QPoint(1, 0));
+    pPainter->drawLine(topRect.topLeft(),    topRect.bottomLeft());
 
     /* Restore painter: */

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

@@ -311 +311 @@
         void paintBackground(QPainter *pPainter, const QRect &rect);
         /** Paints frame rectangle using specified @a pPainter and certain @a rect. */
-        void paintFrameRectangle(QPainter *pPainter, const QRect &rect);
+        void paintFrame(QPainter *pPainter, const QRect &rect);
         /** Paints header using specified @a pPainter and certain @a rect. */
         void paintHeader(QPainter *pPainter, const QRect &rect);