Changeset 69640 in vbox for trunk

Timestamp:

Nov 10, 2017 12:27:15 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8694: Selector UI: HiDPI support for graphics-button used in chooser/details; also a bit of cleanup there.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/widgets/graphics

Files:

• UIGraphicsButton.cpp (modified) (5 diffs)
• UIGraphicsButton.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/widgets/graphics/UIGraphicsButton.cpp

@@ -21 +21 @@
 
 /* Qt includes: */
+# include <QApplication>
 # include <QPainter>
+# include <QStyle>
 # include <QGraphicsSceneMouseEvent>
 
@@ -33 +35 @@
     : QIGraphicsWidget(pParent)
     , m_icon(icon)
-    , m_buttonType(UIGraphicsButtonType_Iconified)
     , m_fParentSelected(false)
 {
@@ -42 +43 @@
 UIGraphicsButton::UIGraphicsButton(QIGraphicsWidget *pParent, UIGraphicsButtonType buttonType)
     : QIGraphicsWidget(pParent)
-    , m_buttonType(buttonType)
     , m_fParentSelected(false)
 {
@@ -61 +61 @@
     switch (iKey)
     {
-        case GraphicsButton_Margin: return 0;
-        case GraphicsButton_IconSize: return m_icon.isNull() ? QSize(16, 16) : m_icon.availableSizes().first();
-        case GraphicsButton_Icon: return m_icon;
+        case GraphicsButton_Margin:
+            return 0;
+        case GraphicsButton_IconSize:
+        {
+            const int iMetric = QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize);
+            return QSize(iMetric, iMetric);
+        }
+        case GraphicsButton_Icon:
+            return m_icon;
         default: break;
     }
@@ -93 +99 @@
     QSize iconSize = data(GraphicsButton_IconSize).toSize();
 
-    /* Which type button has: */
-    switch (m_buttonType)
-    {
-        case UIGraphicsButtonType_Iconified:
-        {
-            /* Just draw the pixmap: */
-            pPainter->drawPixmap(QRect(QPoint(iMargin, iMargin), iconSize), icon.pixmap(iconSize));
-            break;
-        }
-        case UIGraphicsButtonType_DirectArrow:
-        {
-            /* Prepare variables: */
-            QPalette pal = palette();
-            QColor buttonColor = pal.color(m_fParentSelected ? QPalette::HighlightedText : QPalette::Mid);
-#ifdef VBOX_WS_MAC
-            /* Mac is using only light standard highlight colors, keeping highlight-text color always black.
-             * User can choose a darker (non-standard) highlight color but it will be his visibility problem.
-             * I think using highlight-text color (black) for arrow-buttons is too ugly,
-             * so the corresponding color will be received from the highlight color: */
-            if (m_fParentSelected)
-                buttonColor = pal.color(QPalette::Highlight).darker(150);
-#endif /* VBOX_WS_MAC */
-
-            /* Setup: */
-            pPainter->setRenderHint(QPainter::Antialiasing);
-            QPen pen = pPainter->pen();
-            pen.setColor(buttonColor);
-            pen.setWidth(2);
-            pen.setCapStyle(Qt::RoundCap);
-
-            /* Draw path: */
-            QPainterPath circlePath;
-            circlePath.moveTo(iMargin, iMargin);
-            circlePath.lineTo(iMargin + iconSize.width() / 2, iMargin);
-            circlePath.arcTo(QRectF(circlePath.currentPosition(), iconSize).translated(-iconSize.width() / 2, 0), 90, -180);
-            circlePath.lineTo(iMargin, iMargin + iconSize.height());
-            circlePath.closeSubpath();
-            pPainter->strokePath(circlePath, pen);
-
-            /* Draw triangle: */
-            QPainterPath linePath;
-            linePath.moveTo(iMargin + 5, iMargin + 5);
-            linePath.lineTo(iMargin + iconSize.height() - 5, iMargin + iconSize.width() / 2);
-            linePath.lineTo(iMargin + 5, iMargin + iconSize.width() - 5);
-            pPainter->strokePath(linePath, pen);
-            break;
-        }
-        case UIGraphicsButtonType_RoundArrow:
-        {
-            /* Prepare variables: */
-            QPalette pal = palette();
-            QColor buttonColor = pal.color(m_fParentSelected ? QPalette::HighlightedText : QPalette::Mid);
-#ifdef VBOX_WS_MAC
-            /* Mac is using only light standard highlight colors, keeping highlight-text color always black.
-             * User can choose a darker (non-standard) highlight color but it will be his visibility problem.
-             * I think using highlight-text color (black) for arrow-buttons is too ugly,
-             * so the corresponding color will be received from the highlight color: */
-            if (m_fParentSelected)
-                buttonColor = pal.color(QPalette::Highlight).darker(150);
-#endif /* VBOX_WS_MAC */
-
-            /* Setup: */
-            pPainter->setRenderHint(QPainter::Antialiasing);
-            QPen pen = pPainter->pen();
-            pen.setColor(buttonColor);
-            pen.setWidth(2);
-            pen.setCapStyle(Qt::RoundCap);
-
-            /* Draw circle: */
-            QPainterPath circlePath;
-            circlePath.moveTo(iMargin, iMargin);
-            circlePath.addEllipse(QRectF(circlePath.currentPosition(), iconSize));
-            pPainter->strokePath(circlePath, pen);
-
-            /* Draw triangle: */
-            QPainterPath linePath;
-            linePath.moveTo(iMargin + 5, iMargin + 5);
-            linePath.lineTo(iMargin + iconSize.height() - 5, iMargin + iconSize.width() / 2);
-            linePath.lineTo(iMargin + 5, iMargin + iconSize.width() - 5);
-            pPainter->strokePath(linePath, pen);
-            break;
-        }
-    }
+    /* Just draw the pixmap: */
+    pPainter->drawPixmap(QRect(QPoint(iMargin, iMargin), iconSize), icon.pixmap(iconSize));
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/widgets/graphics/UIGraphicsButton.h

@@ -87 +87 @@
     /* Variables: */
     QIcon m_icon;
-    UIGraphicsButtonType m_buttonType;
     bool m_fParentSelected;
 };