Changeset 75204 in vbox for trunk/src/VBox/Frontends

Timestamp:

Oct 31, 2018 10:55:45 AM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9241: VirtualBox Manager: Chooser pane: Drag token style fix for machine item.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemMachine.cpp (modified) (3 diffs)

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

@@ -1049 +1049 @@
     {
         /* Window color: */
-        QColor base = pal.color(QPalette::Active, model()->currentItems().contains(unconst(this)) ?
-                                QPalette::Highlight : QPalette::Window);
+        QColor color1;
+        QColor color2;
+
         QLinearGradient dragTokenGradient;
         QRect dragTokenRect = rectangle;
         if (dragTokenPlace() == DragToken_Up)
         {
+            /* Selection background: */
+            if (model()->currentItems().contains(unconst(this)))
+            {
+                QColor backgroundColor = pal.color(QPalette::Active, QPalette::Highlight);
+                color1 = backgroundColor.lighter(m_iHighlightLightnessMax);
+                color2 = backgroundColor.lighter(m_iHighlightLightnessMax - 70);
+            }
+            /* Default background: */
+            else
+            {
+                QColor backgroundColor = pal.color(QPalette::Active, QPalette::Mid);
+                color1 = backgroundColor.lighter(m_iDefaultLightnessMax);
+                color2 = backgroundColor.lighter(m_iDefaultLightnessMax - 70);
+            }
+
             dragTokenRect.setHeight(5);
             dragTokenGradient.setStart(dragTokenRect.bottomLeft());
@@ -1061 +1077 @@
         else if (dragTokenPlace() == DragToken_Down)
         {
-            dragTokenRect.setTopLeft(dragTokenRect.bottomLeft() - QPoint(0, 5));
+            /* Selection background: */
+            if (model()->currentItems().contains(unconst(this)))
+            {
+                QColor backgroundColor = pal.color(QPalette::Active, QPalette::Highlight);
+                color1 = backgroundColor.lighter(m_iHighlightLightnessMin);
+                color2 = backgroundColor.lighter(m_iHighlightLightnessMin - 40);
+            }
+            /* Default background: */
+            else
+            {
+                QColor backgroundColor = pal.color(QPalette::Active, QPalette::Mid);
+                color1 = backgroundColor.lighter(m_iDefaultLightnessMin);
+                color2 = backgroundColor.lighter(m_iDefaultLightnessMin - 40);
+            }
+
+            dragTokenRect.setTopLeft(dragTokenRect.bottomLeft() - QPoint(0, 4));
             dragTokenGradient.setStart(dragTokenRect.topLeft());
             dragTokenGradient.setFinalStop(dragTokenRect.bottomLeft());
         }
-        dragTokenGradient.setColorAt(0, base.darker(dragTokenDarkness()));
-        dragTokenGradient.setColorAt(1, base.darker(dragTokenDarkness() + 40));
+        dragTokenGradient.setColorAt(0, color1);
+        dragTokenGradient.setColorAt(1, color2);
         pPainter->fillRect(dragTokenRect, dragTokenGradient);
     }
@@ -1099 +1130 @@
 
     /* Draw borders: */
-    pPainter->drawLine(rectangle.topLeft(),    rectangle.topRight()    + QPoint(1, 0));
-    pPainter->drawLine(rectangle.bottomLeft(), rectangle.bottomRight() + QPoint(1, 0));
+    if (dragTokenPlace() != DragToken_Up)
+        pPainter->drawLine(rectangle.topLeft(),    rectangle.topRight()    + QPoint(1, 0));
+    if (dragTokenPlace() != DragToken_Down)
+        pPainter->drawLine(rectangle.bottomLeft(), rectangle.bottomRight() + QPoint(1, 0));
     pPainter->drawLine(rectangle.topLeft(),    rectangle.bottomLeft());