Changeset 74467 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Sep 25, 2018 6:25:36 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: VirtualBox Manager: Chooser and Tools panes: Sync painting rules.

Location:

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

Files:

• chooser/UIChooserItemMachine.cpp (modified) (12 diffs)
• chooser/UIChooserItemMachine.h (modified) (1 diff)
• tools/UIToolsItem.cpp (modified) (3 diffs)

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

@@ -38 +38 @@
 # include "COMEnums.h"
 # include "CMachine.h"
+
+/* Other VBox includes: */
+#include "iprt/cpp/utils.h"
 
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
@@ -245 +248 @@
 }
 
-void UIChooserItemMachine::paint(QPainter *pPainter, const QStyleOptionGraphicsItem *pOption, QWidget* /* pWidget = 0 */)
-{
-    /* Paint decorations: */
-    paintDecorations(pPainter, pOption);
+void UIChooserItemMachine::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 machine info: */
-    paintMachineInfo(pPainter, pOption);
+    paintMachineInfo(pPainter, rectangle);
 }
 
@@ -883 +891 @@
 }
 
-void UIChooserItemMachine::paintDecorations(QPainter *pPainter, const QStyleOptionGraphicsItem *pOption)
-{
-    /* Prepare variables: */
-    const QRect fullRect = pOption->rect;
-
-    /* Paint background: */
-    paintBackground(pPainter, fullRect);
-    /* Paint frame: */
-    paintFrameRectangle(pPainter, fullRect);
-}
-
-void UIChooserItemMachine::paintBackground(QPainter *pPainter, const QRect &rect)
+void UIChooserItemMachine::paintBackground(QPainter *pPainter, const QRect &rectangle) const
 {
     /* Save painter: */
@@ -900 +897 @@
 
     /* Prepare color: */
-    QPalette pal = palette();
+    const QPalette pal = palette();
 
     /* Selection background: */
-    if (model()->currentItems().contains(this))
+    if (model()->currentItems().contains(unconst(this)))
     {
         /* Prepare color: */
-        QColor highlight = pal.color(QPalette::Active, QPalette::Highlight);
+        QColor backgroundColor = pal.color(QPalette::Active, QPalette::Highlight);
         /* Draw gradient: */
-        QLinearGradient bgGrad(rect.topLeft(), rect.bottomLeft());
-        bgGrad.setColorAt(0, highlight.lighter(m_iHighlightLightnessMax));
-        bgGrad.setColorAt(1, highlight.lighter(m_iHighlightLightnessMin));
-        pPainter->fillRect(rect, bgGrad);
+        QLinearGradient bgGrad(rectangle.topLeft(), rectangle.bottomLeft());
+        bgGrad.setColorAt(0, backgroundColor.lighter(m_iHighlightLightnessMax));
+        bgGrad.setColorAt(1, backgroundColor.lighter(m_iHighlightLightnessMin));
+        pPainter->fillRect(rectangle, bgGrad);
     }
     /* Hovering background: */
@@ -917 +914 @@
     {
         /* Prepare color: */
-        QColor highlight = pal.color(QPalette::Active, QPalette::Highlight);
+        QColor backgroundColor = pal.color(QPalette::Active, QPalette::Highlight);
         /* Draw gradient: */
-        QLinearGradient bgGrad(rect.topLeft(), rect.bottomLeft());
-        bgGrad.setColorAt(0, highlight.lighter(m_iHoverLightnessMax));
-        bgGrad.setColorAt(1, highlight.lighter(m_iHoverLightnessMin));
-        pPainter->fillRect(rect, bgGrad);
+        QLinearGradient bgGrad(rectangle.topLeft(), rectangle.bottomLeft());
+        bgGrad.setColorAt(0, backgroundColor.lighter(m_iHoverLightnessMax));
+        bgGrad.setColorAt(1, backgroundColor.lighter(m_iHoverLightnessMin));
+        pPainter->fillRect(rectangle, bgGrad);
     }
     /* Default background: */
@@ -928 +925 @@
     {
         /* Prepare color: */
-        QColor usual = pal.color(QPalette::Active, QPalette::Mid);
+        QColor backgroundColor = pal.color(QPalette::Active, QPalette::Mid);
         /* Draw gradient: */
-        QLinearGradient bgGrad(rect.topLeft(), rect.bottomLeft());
-        bgGrad.setColorAt(0, usual.lighter(m_iHoverLightnessMax));
-        bgGrad.setColorAt(1, usual.lighter(m_iHoverLightnessMin));
-        pPainter->fillRect(rect, bgGrad);
+        QLinearGradient bgGrad(rectangle.topLeft(), rectangle.bottomLeft());
+        bgGrad.setColorAt(0, backgroundColor.lighter(m_iHoverLightnessMax));
+        bgGrad.setColorAt(1, backgroundColor.lighter(m_iHoverLightnessMin));
+        pPainter->fillRect(rectangle, bgGrad);
     }
 
@@ -940 +937 @@
     {
         /* Window color: */
-        QColor base = pal.color(QPalette::Active, model()->currentItems().contains(this) ?
+        QColor base = pal.color(QPalette::Active, model()->currentItems().contains(unconst(this)) ?
                                 QPalette::Highlight : QPalette::Window);
         QLinearGradient dragTokenGradient;
-        QRect dragTokenRect = rect;
+        QRect dragTokenRect = rectangle;
         if (dragTokenPlace() == DragToken_Up)
         {
@@ -965 +962 @@
 }
 
-void UIChooserItemMachine::paintFrameRectangle(QPainter *pPainter, const QRect &rect)
+void UIChooserItemMachine::paintFrame(QPainter *pPainter, const QRect &rectangle) const
 {
     /* Save painter: */
@@ -971 +968 @@
 
     /* Prepare color: */
-    QPalette pal = palette();
+    const QPalette pal = palette();
     QColor strokeColor;
 
     /* Selection frame: */
-    if (model()->currentItems().contains(this))
+    if (model()->currentItems().contains(unconst(this)))
         strokeColor = pal.color(QPalette::Active, QPalette::Highlight).lighter(m_iHighlightLightnessMin - 40);
     /* Hovering frame: */
@@ -990 +987 @@
 
     /* 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(rectangle.topLeft(),    rectangle.topRight()    + QPoint(1, 0));
+    pPainter->drawLine(rectangle.bottomLeft(), rectangle.bottomRight() + QPoint(1, 0));
+    pPainter->drawLine(rectangle.topLeft(),    rectangle.bottomLeft());
 
     /* Restore painter: */
@@ -998 +995 @@
 }
 
-void UIChooserItemMachine::paintMachineInfo(QPainter *pPainter, const QStyleOptionGraphicsItem *pOption)
+void UIChooserItemMachine::paintMachineInfo(QPainter *pPainter, const QRect &rectangle) const
 {
     /* Prepare variables: */
-    QRect fullRect = pOption->rect;
-    const int iFullHeight = fullRect.height();
+    const int iFullHeight = rectangle.height();
     const int iMargin = data(MachineItemData_Margin).toInt();
     const int iMajorSpacing = data(MachineItemData_MajorSpacing).toInt();
@@ -1010 +1006 @@
 
     /* Selected item foreground: */
-    if (model()->currentItems().contains(this))
+    if (model()->currentItems().contains(unconst(this)))
     {
         QPalette pal = palette();

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

@@ -247 +247 @@
     /** @name Painting stuff.
       * @{ */
-        /** Paints decorations using specified @a pPainter and certain @a pOptions. */
-        void paintDecorations(QPainter *pPainter, const QStyleOptionGraphicsItem *pOption);
-        /** 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 machine info using specified @a pPainter and certain @a pOptions. */
-        void paintMachineInfo(QPainter *pPainter, const QStyleOptionGraphicsItem *pOption);
+        /** 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 rectangle. */
+        void paintFrame(QPainter *pPainter, const QRect &rectangle) const;
+        /** Paints machine info using specified @a pPainter and certain @a rectangle. */
+        void paintMachineInfo(QPainter *pPainter, const QRect &rectangle) const;
     /** @} */
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsItem.cpp

@@ -403 +403 @@
 void UIToolsItem::paint(QPainter *pPainter, const QStyleOptionGraphicsItem *pOptions, QWidget * /* pWidget = 0 */)
 {
-    /* Setup: */
-    pPainter->setRenderHint(QPainter::Antialiasing);
-
     /* Acquire rectangle: */
     const QRect rectangle = pOptions->rect;
@@ -439 +436 @@
     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 */
 
@@ -753 +750 @@
     /* Selection frame: */
     if (model()->currentItem() == 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);
-
-    /* Assign pen: */
-    pPainter->setPen(strokeColor);
+        strokeColor = pal.color(QPalette::Active, QPalette::Mid).lighter(m_iHoverLightnessMin);
+
+    /* Create/assign pen: */
+    QPen pen(strokeColor);
+    pen.setWidth(0);
+    pPainter->setPen(pen);
 
     /* Draw frame: */