Changeset 43153 in vbox

Timestamp:

Sep 3, 2012 5:06:09 PM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: VM selector UI: Colors reworked for machine/group items (hover,
highlight).

Location:

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

Files:

• chooser/UIGChooserItem.cpp (modified) (1 diff)
• chooser/UIGChooserItem.h (modified) (2 diffs)
• chooser/UIGChooserItemGroup.cpp (modified) (6 diffs)
• chooser/UIGChooserItemGroup.h (modified) (2 diffs)
• chooser/UIGChooserItemMachine.cpp (modified) (5 diffs)
• chooser/UIGChooserItemMachine.h (modified) (1 diff)
• details/UIGDetailsElement.cpp (modified) (1 diff)

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

@@ -45 +45 @@
     , m_pBackwardAnimation(0)
     , m_iAnimationDuration(400)
-    , m_iDefaultDarkness(103)
-    , m_iBlackoutDarkness(110)
+    , m_iDefaultDarkness(100)
     , m_iHighlightDarkness(90)
+    , m_iAnimationDarkness(m_iDefaultDarkness)
     , m_iStrokeDarkness(130)
-    , m_iAnimationDarkness(m_iDefaultDarkness)
-    , m_iDragTokenDarkness(150)
+    , m_iDragTokenDarkness(110)
 {
     /* Basic item setup: */

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

@@ -142 +142 @@
 
     /* Hover stuff: */
+    int defaultDarkness() const { return m_iDefaultDarkness; }
+    int highlightDarkness() const { return m_iHighlightDarkness; }
+    int animationDarkness() const { return m_iAnimationDarkness; }
+    void setDefaultDarkness(int iDefaultDarkness) { m_iDefaultDarkness = iDefaultDarkness; update(); }
+    void setHighlightDarkness(int iHighlightDarkness) { m_iHighlightDarkness = iHighlightDarkness; update(); }
     void setAnimationDarkness(int iAnimationDarkness) { m_iAnimationDarkness = iAnimationDarkness; update(); }
 
-    /* Color stuff: */
-    int defaultDarkness() const { return m_iDefaultDarkness; }
-    int blackoutDarkness() const { return m_iBlackoutDarkness; }
-    int highlightDarkness() const { return m_iHighlightDarkness; }
+    /* Other color stuff: */
     int strokeDarkness() const { return m_iStrokeDarkness; }
-    int animationDarkness() const { return m_iAnimationDarkness; }
     int dragTokenDarkness() const { return m_iDragTokenDarkness; }
 
@@ -171 +172 @@
     int m_iAnimationDuration;
     int m_iDefaultDarkness;
-    int m_iBlackoutDarkness;
     int m_iHighlightDarkness;
+    int m_iAnimationDarkness;
     int m_iStrokeDarkness;
-    int m_iAnimationDarkness;
     int m_iDragTokenDarkness;
 };

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

@@ -47 +47 @@
     , m_iCornerRadius(10)
     , m_fMainRoot(true)
+    , m_iBlackoutDarkness(110)
 {
     /* Prepare: */
@@ -70 +71 @@
     , m_iCornerRadius(10)
     , m_fMainRoot(fMainRoot)
+    , m_iBlackoutDarkness(110)
 {
     /* Prepare: */
@@ -97 +99 @@
     , m_iCornerRadius(10)
     , m_fMainRoot(false)
+    , m_iBlackoutDarkness(110)
 {
     /* Prepare: */
@@ -123 +126 @@
     , m_iCornerRadius(10)
     , m_fMainRoot(false)
+    , m_iBlackoutDarkness(110)
 {
     /* Prepare: */
@@ -1113 +1117 @@
     /* Prepare color: */
     QPalette pal = palette();
-    QColor windowColor = pal.color(QPalette::Active, model()->selectionList().contains(this) ?
+    QColor windowColor = pal.color(QPalette::Active,
+                                   model()->selectionList().contains(this) ?
                                    QPalette::Highlight : QPalette::Window);
 
@@ -1217 +1222 @@
                 dragTokenGradient.setFinalStop(dragTokenRect.bottomLeft());
             }
-            dragTokenGradient.setColorAt(0, windowColor.darker(blackoutDarkness()));
-            dragTokenGradient.setColorAt(1, windowColor.darker(dragTokenDarkness()));
+            dragTokenGradient.setColorAt(0, windowColor.darker(dragTokenDarkness()));
+            dragTokenGradient.setColorAt(1, windowColor.darker(dragTokenDarkness() + 40));
             pPainter->fillRect(dragTokenRect, dragTokenGradient);
         }

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

@@ -174 +174 @@
     static void copyContent(UIGChooserItemGroup *pFrom, UIGChooserItemGroup *pTo);
 
+    /* Color stuff: */
+    int blackoutDarkness() const { return m_iBlackoutDarkness; }
+
     /* Variables: */
     QString m_strName;
@@ -187 +190 @@
     int m_iCornerRadius;
     bool m_fMainRoot;
+    int m_iBlackoutDarkness;
 };
 

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

@@ -52 +52 @@
     , m_pCloseButton(0)
     , m_iCornerRadius(0)
+#ifdef Q_WS_MAC
+    , m_iHighlightLightness(115)
+    , m_iHoverLightness(110)
+    , m_iHoverHighlightLightness(120)
+#else /* Q_WS_MAC */
+    , m_iHighlightLightness(130)
+    , m_iHoverLightness(155)
+    , m_iHoverHighlightLightness(175)
+#endif /* !Q_WS_MAC */
 {
 //    /* Prepare: */
@@ -73 +82 @@
     , m_pCloseButton(0)
     , m_iCornerRadius(0)
+#ifdef Q_WS_MAC
+    , m_iHighlightLightness(115)
+    , m_iHoverLightness(110)
+    , m_iHoverHighlightLightness(120)
+#else /* Q_WS_MAC */
+    , m_iHighlightLightness(130)
+    , m_iHoverLightness(155)
+    , m_iHoverHighlightLightness(175)
+#endif /* !Q_WS_MAC */
 {
 //    /* Prepare: */
@@ -563 +581 @@
     if (model()->selectionList().contains(this))
     {
-        /* Highlight color: */
+        /* Prepare color: */
         QColor highlight = pal.color(QPalette::Highlight);
-
-        /* Calculate top rectangle: */
-        QRect tRect = rect;
-        tRect.setBottom(tRect.top() + tRect.height() / 3);
-        /* Calculate bottom rectangle: */
-        QRect bRect = rect;
-        bRect.setTop(bRect.bottom() - bRect.height() / 3);
-        /* Calculate middle rectangle: */
-        QRect midRect = QRect(tRect.bottomLeft(), bRect.topRight());
-
-        /* Prepare top gradient: */
-        QLinearGradient tGradient(tRect.bottomLeft(), tRect.topLeft());
-        tGradient.setColorAt(1, highlight.darker(blackoutDarkness()));
-        tGradient.setColorAt(0, highlight.darker(defaultDarkness()));
-        /* Prepare bottom gradient: */
-        QLinearGradient bGradient(bRect.topLeft(), bRect.bottomLeft());
-        bGradient.setColorAt(0, highlight.darker(defaultDarkness()));
-        bGradient.setColorAt(1, highlight.darker(blackoutDarkness()));
-
-        /* Paint all the stuff: */
-        pPainter->fillRect(midRect, highlight.darker(defaultDarkness()));
-        pPainter->fillRect(tRect, tGradient);
-        pPainter->fillRect(bRect, bGradient);
+        /* Draw gradient: */
+        QLinearGradient bgGrad(rect.topLeft(), rect.bottomLeft());
+        bgGrad.setColorAt(0, highlight.lighter(m_iHighlightLightness));
+        bgGrad.setColorAt(1, highlight);
+        pPainter->fillRect(rect, bgGrad);
     }
 
     /* Hovering background: */
-    if (isHovered())
-    {
-        /* Choose color: */
-        QColor baseLight = model()->selectionList().contains(this) ? pal.color(QPalette::Active, QPalette::Highlight) :
-                                                                     QColor(Qt::white);
-        QColor blurBase = model()->selectionList().contains(this) ? pal.color(QPalette::Active, QPalette::Highlight) :
-                                                                    QColor(Qt::white);
-        if (!model()->selectionList().contains(this) && !parentItem()->isRoot())
-            blurBase = blurBase.darker(defaultDarkness());
-        blurBase.setAlpha(0);
-
-        /* Draw background for blur: */
-        QImage background(rect.size(), QImage::Format_ARGB32);
-        background.fill(blurBase.rgba());
-
-        /* Add blur itself: */
-        QPainter blurPainter(&background);
-        blurPainter.setBrush(baseLight.darker(animationDarkness()));
-        blurPainter.setPen(Qt::NoPen);
-        blurPainter.drawRoundedRect(rect.adjusted(5, 5, -5, -5), 5, 5);
-        blurPainter.end();
-        QImage bluredBackground(rect.size(), QImage::Format_ARGB32);
-        blurImage(background, bluredBackground, 5);
-
-        /* Paint highlight bar: */
-        pPainter->drawImage(QPoint(0, 0), bluredBackground);
+    else if (isHovered())
+    {
+        /* Prepare color: */
+        QColor highlight = pal.color(QPalette::Highlight);
+        /* Draw gradient: */
+        QLinearGradient bgGrad(rect.topLeft(), rect.bottomLeft());
+        bgGrad.setColorAt(0, highlight.lighter(m_iHoverHighlightLightness));
+        bgGrad.setColorAt(1, highlight.lighter(m_iHoverLightness));
+        pPainter->fillRect(rect, bgGrad);
     }
 
@@ -639 +622 @@
             dragTokenGradient.setFinalStop(dragTokenRect.bottomLeft());
         }
-        dragTokenGradient.setColorAt(0, base.darker(blackoutDarkness()));
-        dragTokenGradient.setColorAt(1, base.darker(dragTokenDarkness()));
+        dragTokenGradient.setColorAt(0, base.darker(dragTokenDarkness()));
+        dragTokenGradient.setColorAt(1, base.darker(dragTokenDarkness() + 40));
         pPainter->fillRect(dragTokenRect, dragTokenGradient);
     }
@@ -650 +633 @@
 void UIGChooserItemMachine::paintFrameRectangle(QPainter *pPainter, const QRect &rect)
 {
-    /* Only chosen item should have a frame: */
-    if (!model()->selectionList().contains(this))
+    /* Only chosen and/or hovered item should have a frame: */
+    if (!model()->selectionList().contains(this) && !isHovered())
         return;
 
     /* Simple white frame: */
     pPainter->save();
-    pPainter->setPen(Qt::white);
+    QPalette pal = palette();
+    QColor hc = pal.color(QPalette::Active, QPalette::Highlight);
+    if (model()->selectionList().contains(this))
+        hc = hc.darker(strokeDarkness());
+    pPainter->setPen(hc);
     pPainter->drawRect(rect);
     pPainter->restore();

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

@@ -140 +140 @@
     UIGraphicsZoomButton *m_pCloseButton;
     int m_iCornerRadius;
+    int m_iHighlightLightness;
+    int m_iHoverLightness;
+    int m_iHoverHighlightLightness;
 };
 

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsElement.cpp

@@ -52 +52 @@
     , m_pBackwardAnimation(0)
     , m_iAnimationDuration(400)
-    , m_iDefaultDarkness(103)
+    , m_iDefaultDarkness(100)
     , m_iHighlightDarkness(90)
     , m_iAnimationDarkness(m_iDefaultDarkness)