Changeset 74481 in vbox for trunk

Timestamp:

Sep 26, 2018 3:43:18 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: VirtualBox Manager: Chooser pane: Sync painting rules between machine and global items as well (s.a. r125322).

Location:

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

Files:

• UIChooserItemGlobal.cpp (modified) (6 diffs)
• UIChooserItemGlobal.h (modified) (1 diff)

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

@@ -32 +32 @@
 # include "UIVirtualBoxManager.h"
 
+/* Other VBox includes: */
+#include "iprt/cpp/utils.h"
+
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
@@ -176 +179 @@
 }
 
-void UIChooserItemGlobal::paint(QPainter *pPainter, const QStyleOptionGraphicsItem *pOption, QWidget * /* pWidget = 0 */)
-{
-    /* Setup: */
-    pPainter->setRenderHint(QPainter::Antialiasing);
-
-    /* Paint decorations: */
-    paintDecorations(pPainter, pOption);
-
+void UIChooserItemGlobal::paint(QPainter *pPainter, const QStyleOptionGraphicsItem *pOptions, QWidget * /* pWidget = 0 */)
+{
+    /* Acquire rectangle: */
+    const QRect rectangle = pOptions->rect;
+
+    /* Paint background: */
+    paintBackground(pPainter, rectangle);
+    /* Paint frame: */
+    paintFrame(pPainter, rectangle);
     /* Paint global info: */
-    paintGlobalInfo(pPainter, pOption);
+    paintGlobalInfo(pPainter, rectangle);
 }
 
@@ -508 +512 @@
 }
 
-void UIChooserItemGlobal::paintDecorations(QPainter *pPainter, const QStyleOptionGraphicsItem *pOption)
-{
-    /* Prepare variables: */
-    QRect fullRect = pOption->rect;
-
-    /* Paint background: */
-    paintBackground(pPainter, fullRect);
-
-    /* Paint frame: */
-    paintFrameRectangle(pPainter, fullRect);
-}
-
-void UIChooserItemGlobal::paintBackground(QPainter *pPainter, const QRect &rect)
+void UIChooserItemGlobal::paintBackground(QPainter *pPainter, const QRect &rectangle) const
 {
     /* Save painter: */
@@ -529 +521 @@
 
     /* Selection background: */
-    if (model()->currentItems().contains(this))
+    if (model()->currentItems().contains(unconst(this)))
     {
         /* Prepare color: */
         QColor highlight = pal.color(QPalette::Active, QPalette::Highlight);
         /* Draw gradient: */
-        QLinearGradient bgGrad(rect.topLeft(), rect.bottomLeft());
+        QLinearGradient bgGrad(rectangle.topLeft(), rectangle.bottomLeft());
         bgGrad.setColorAt(0, highlight.lighter(m_iHighlightLightness));
         bgGrad.setColorAt(1, highlight);
-        pPainter->fillRect(rect, bgGrad);
+        pPainter->fillRect(rectangle, bgGrad);
     }
     /* Hovering background: */
@@ -545 +537 @@
         QColor highlight = pal.color(QPalette::Active, QPalette::Highlight);
         /* Draw gradient: */
-        QLinearGradient bgGrad(rect.topLeft(), rect.bottomLeft());
+        QLinearGradient bgGrad(rectangle.topLeft(), rectangle.bottomLeft());
         bgGrad.setColorAt(0, highlight.lighter(m_iHoverHighlightLightness));
         bgGrad.setColorAt(1, highlight.lighter(m_iHoverLightness));
-        pPainter->fillRect(rect, bgGrad);
+        pPainter->fillRect(rectangle, bgGrad);
     }
 
@@ -555 +547 @@
 }
 
-void UIChooserItemGlobal::paintFrameRectangle(QPainter *pPainter, const QRect &rect)
+void UIChooserItemGlobal::paintFrame(QPainter *pPainter, const QRect &rectangle) const
 {
     /* Only chosen and/or hovered item should have a frame: */
-    if (!model()->currentItems().contains(this) && !isHovered())
+    if (!model()->currentItems().contains(unconst(this)) && !isHovered())
         return;
 
-    /* Simple frame: */
+    /* Save painter: */
     pPainter->save();
+
+    /* Prepare color: */
     const QPalette pal = palette();
     QColor strokeColor = pal.color(QPalette::Active,
-                                   model()->currentItems().contains(this) ?
+                                   model()->currentItems().contains(unconst(this)) ?
                                    QPalette::Mid : QPalette::Highlight);
-    pPainter->setPen(strokeColor);
-    pPainter->drawRect(rect);
+
+    /* Create/assign pen: */
+    QPen pen(strokeColor);
+    pen.setWidth(0);
+    pPainter->setPen(pen);
+
+    /* Draw rectangle: */
+    pPainter->drawRect(rectangle);
+
+    /* Restore painter: */
     pPainter->restore();
 }
 
-void UIChooserItemGlobal::paintGlobalInfo(QPainter *pPainter, const QStyleOptionGraphicsItem *pOption)
+void UIChooserItemGlobal::paintGlobalInfo(QPainter *pPainter, const QRect &rectangle) const
 {
     /* Prepare variables: */
-    const QRect fullRect = pOption->rect;
-    const int iFullHeight = fullRect.height();
+    const int iFullHeight = rectangle.height();
     const int iMargin = data(GlobalItemData_Margin).toInt();
     const int iSpacing = data(GlobalItemData_Spacing).toInt();
 
     /* Selected item foreground: */
-    if (model()->currentItems().contains(this))
+    if (model()->currentItems().contains(unconst(this)))
     {
         const QPalette pal = palette();

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

@@ -205 +205 @@
     /** @name Painting stuff.
       * @{ */
-        /** Paints decorations using specified @a pPainter and certain @a pOptions. */
-        void paintDecorations(QPainter *pPainter, const QStyleOptionGraphicsItem *pOptions);
-        /** Paints background using specified @a pPainter and certain @a rect. */
-        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);
+        /** Paints background using specified @a pPainter and certain @a rectangle. */
+        void paintBackground(QPainter *pPainter, const QRect &rectangle) const;
+        /** Paints frame using specified @a pPainter and certain @a rect. */
+        void paintFrame(QPainter *pPainter, const QRect &rectangle) const;
         /** Paints global info using specified @a pPainter and certain @a pOptions. */
-        void paintGlobalInfo(QPainter *pPainter, const QStyleOptionGraphicsItem *pOptions);
+        void paintGlobalInfo(QPainter *pPainter, const QRect &rectangle) const;
     /** @} */