Changeset 43822 in vbox

Timestamp:

Nov 7, 2012 8:46:33 AM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: VM group UI: One more group-item rework (painting related).

Location:

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser

Files:

• UIGChooserItemGroup.cpp (modified) (15 diffs)
• UIGChooserItemGroup.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserItemGroup.cpp

@@ -1054 +1054 @@
 }
 
-int UIGChooserItemGroup::minimumWidthHint(bool fClosedGroup) const
+int UIGChooserItemGroup::minimumWidthHint(bool fOpenedGroup) const
 {
     /* Prepare variables: */
     int iHorizontalMargin = data(GroupItemData_HorizonalMargin).toInt();
-    QSize fullHeaderSize = data(GroupItemData_FullHeaderSize).toSize();
+    int iFullHeaderWidth = data(GroupItemData_FullHeaderSize).toSize().width();
 
     /* Calculating proposed width: */
@@ -1066 +1066 @@
     iProposedWidth += 2 * iHorizontalMargin;
     /* And full header width to take into account: */
-    iProposedWidth += fullHeaderSize.width();
+    iProposedWidth += iFullHeaderWidth;
     /* But if group is opened: */
-    if (!fClosedGroup)
+    if (fOpenedGroup)
     {
         /* Prepare variables: */
@@ -1084 +1084 @@
 }
 
-int UIGChooserItemGroup::minimumHeightHint(bool fClosedGroup) const
+int UIGChooserItemGroup::minimumHeightHint(bool fOpenedGroup) const
 {
     /* Prepare variables: */
@@ -1090 +1090 @@
     int iVerticalMargin = data(GroupItemData_VerticalMargin).toInt();
     int iMinorSpacing = data(GroupItemData_MinorSpacing).toInt();
-    QSize fullHeaderSize = data(GroupItemData_FullHeaderSize).toSize();
+    int iFullHeaderHeight = data(GroupItemData_FullHeaderSize).toSize().height();
 
     /* Calculating proposed height: */
@@ -1098 +1098 @@
     iProposedHeight += 2 * iVerticalMargin;
     /* And full header height to take into account: */
-    iProposedHeight += fullHeaderSize.height();
+    iProposedHeight += iFullHeaderHeight;
     /* But if group is opened: */
-    if (!fClosedGroup)
+    if (fOpenedGroup)
     {
         /* We should take into account vertical indent: */
@@ -1117 +1117 @@
     }
     /* Finally, additional height during animation: */
-    if (fClosedGroup && m_pToggleButton && m_pToggleButton->isAnimationRunning())
+    if (!fOpenedGroup && m_pToggleButton && m_pToggleButton->isAnimationRunning())
         iProposedHeight += m_iAdditionalHeight;
 
@@ -1126 +1126 @@
 int UIGChooserItemGroup::minimumWidthHint() const
 {
-    return minimumWidthHint(isClosed());
+    return minimumWidthHint(isOpened());
 }
 
 int UIGChooserItemGroup::minimumHeightHint() const
 {
-    return minimumHeightHint(isClosed());
-}
-
-QSizeF UIGChooserItemGroup::minimumSizeHint(bool fClosedGroup) const
-{
-    return QSizeF(minimumWidthHint(fClosedGroup), minimumHeightHint(fClosedGroup));
+    return minimumHeightHint(isOpened());
+}
+
+QSizeF UIGChooserItemGroup::minimumSizeHint(bool fOpenedGroup) const
+{
+    return QSizeF(minimumWidthHint(fOpenedGroup), minimumHeightHint(fOpenedGroup));
 }
 
@@ -1143 +1143 @@
     /* If Qt::MinimumSize requested: */
     if (which == Qt::MinimumSize)
-        return minimumSizeHint(isClosed());
+        return minimumSizeHint(isOpened());
     /* Else call to base-class: */
     return UIGChooserItem::sizeHint(which, constraint);
@@ -1160 +1160 @@
 QPixmap UIGChooserItemGroup::toPixmap()
 {
-    QSize minimumSize = minimumSizeHint(true).toSize();
+    QSize minimumSize = minimumSizeHint(false).toSize();
     QPixmap pixmap(minimumSize);
     pixmap.fill(Qt::transparent);
@@ -1167 +1167 @@
     QStyleOptionGraphicsItem options;
     options.rect = QRect(QPoint(0, 0), minimumSize);
-    paint(&painter, &options, true);
+    paint(&painter, &options);
     return pixmap;
 }
@@ -1401 +1401 @@
 void UIGChooserItemGroup::paint(QPainter *pPainter, const QStyleOptionGraphicsItem *pOption, QWidget* /* pWidget = 0 */)
 {
-    paint(pPainter, pOption, isClosed());
-}
-
-void UIGChooserItemGroup::paint(QPainter *pPainter, const QStyleOptionGraphicsItem *pOption, bool fClosedGroup)
-{
     /* Setup: */
     pPainter->setRenderHint(QPainter::Antialiasing);
 
-    /* Paint decorations: */
-    paintDecorations(pPainter, pOption);
-
-    /* Non for main root: */
-    if (!isMainRoot())
-    {
-        /* Paint group info: */
-        paintGroupInfo(pPainter, pOption, fClosedGroup);
-    }
-}
-
-void UIGChooserItemGroup::paintDecorations(QPainter *pPainter, const QStyleOptionGraphicsItem *pOption)
-{
     /* Paint background: */
     paintBackground(pPainter, pOption->rect);
+
+    /* Paint header: */
+    paintHeader(pPainter, pOption->rect);
 }
 
@@ -1548 +1533 @@
 }
 
-void UIGChooserItemGroup::paintGroupInfo(QPainter *pPainter, const QStyleOptionGraphicsItem *pOption, bool)
-{
+void UIGChooserItemGroup::paintHeader(QPainter *pPainter, const QRect &rect)
+{
+    /* Non for main root: */
+    if (isMainRoot())
+        return;
+
     /* Prepare variables: */
     int iHorizontalMargin = data(GroupItemData_HorizonalMargin).toInt();
@@ -1601 +1590 @@
 
         /* Prepare variables: */
-        QRect fullRect = pOption->rect;
         int iMinorSpacing = data(GroupItemData_MinorSpacing).toInt();
         int iEnterButtonWidth = data(GroupItemData_EnterButtonSize).toSize().width();
@@ -1612 +1600 @@
 
         /* Indent: */
-        int iHorizontalIndent = fullRect.right() - iHorizontalMargin;
+        int iHorizontalIndent = rect.right() - iHorizontalMargin;
         if (!isRoot())
             iHorizontalIndent -= (iEnterButtonWidth + iMinorSpacing);
@@ -1691 +1679 @@
 
     /* Recalculate animation parameters: */
-    QSizeF openedSize = minimumSizeHint(false);
-    QSizeF closedSize = minimumSizeHint(true);
+    QSizeF openedSize = minimumSizeHint(true);
+    QSizeF closedSize = minimumSizeHint(false);
     int iAdditionalHeight = openedSize.height() - closedSize.height();
     m_pToggleButton->setAnimationRange(0, iAdditionalHeight);

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserItemGroup.h

@@ -161 +161 @@
     /* Helpers: Layout stuff: */
     void updateLayout();
-    int minimumWidthHint(bool fClosedGroup) const;
-    int minimumHeightHint(bool fClosedGroup) const;
+    int minimumWidthHint(bool fOpenedGroup) const;
+    int minimumHeightHint(bool fOpenedGroup) const;
     int minimumWidthHint() const;
     int minimumHeightHint() const;
-    QSizeF minimumSizeHint(bool fClosedGroup) const;
+    QSizeF minimumSizeHint(bool fOpenedGroup) const;
     QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const;
 
@@ -184 +184 @@
     /* Helpers: Paint stuff: */
     void paint(QPainter *pPainter, const QStyleOptionGraphicsItem *pOption, QWidget *pWidget = 0);
-    void paint(QPainter *pPainter, const QStyleOptionGraphicsItem *pOption, bool fClosedGroup);
-    void paintDecorations(QPainter *pPainter, const QStyleOptionGraphicsItem *pOption);
     void paintBackground(QPainter *pPainter, const QRect &rect);
-    void paintGroupInfo(QPainter *pPainter, const QStyleOptionGraphicsItem *pOption, bool fClosedGroup);
+    void paintHeader(QPainter *pPainter, const QRect &rect);
 
     /* Helpers: Animation stuff: */