Changeset 69712 in vbox for trunk

Timestamp:

Nov 16, 2017 12:14:46 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8694: Selector UI: HiDPI support fix for graphics-button used in chooser/details: Do not blindly expect that there will be pixmap of required size, check actual one (s.a. r119004).

File:

• trunk/src/VBox/Frontends/VirtualBox/src/widgets/graphics/UIGraphicsButton.cpp (modified) (1 diff)

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

@@ -87 +87 @@
 {
     /* Prepare variables: */
-    int iMargin = data(GraphicsButton_Margin).toInt();
-    QIcon icon = data(GraphicsButton_Icon).value<QIcon>();
-    QSize iconSize = data(GraphicsButton_IconSize).toSize();
+    const int iMargin = data(GraphicsButton_Margin).toInt();
+    const QIcon icon = data(GraphicsButton_Icon).value<QIcon>();
+    const QSize expectedIconSize = data(GraphicsButton_IconSize).toSize();
+    const QPixmap pixmap = icon.pixmap(expectedIconSize);
+    const QSize actualIconSize = pixmap.size() / pixmap.devicePixelRatio();
+    QPoint position = QPoint(iMargin, iMargin);
+    if (actualIconSize != expectedIconSize)
+    {
+        const int iDx = (expectedIconSize.width() - actualIconSize.width()) / 2;
+        const int iDy = (expectedIconSize.height() - actualIconSize.height()) / 2;
+        position += QPoint(iDx, iDy);
+    }
 
     /* Just draw the pixmap: */
-    pPainter->drawPixmap(QRect(QPoint(iMargin, iMargin), iconSize), icon.pixmap(iconSize));
+    pPainter->drawPixmap(position, pixmap);
 }