Changeset 55876 in vbox

Timestamp:

May 15, 2015 4:36:20 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: 6278: Enable HiDPI icons for Win/X11 hosts.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (1 diff)
• src/globals/UIIconPool.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -822 +822 @@
 VirtualBox_SOURCES            += VirtualBox2.qrc
 VirtualBox2.qrc_RCCFLAGS       = -name BASIC2
+VirtualBox_SOURCES             += VirtualBox1_hidpi.qrc
+VirtualBox1_hidpi.qrc_RCCFLAGS  = -name BASIC1_HIDPI
+VirtualBox_SOURCES             += VirtualBox2_hidpi.qrc
+VirtualBox2_hidpi.qrc_RCCFLAGS  = -name BASIC2_HIDPI
 ifeq ($(KBUILD_TARGET),darwin)
- VirtualBox_SOURCES             += VirtualBox1_hidpi.qrc
- VirtualBox1_hidpi.qrc_RCCFLAGS  = -name BASIC1_HIDPI
- VirtualBox_SOURCES             += VirtualBox2_hidpi.qrc
- VirtualBox2_hidpi.qrc_RCCFLAGS  = -name BASIC2_HIDPI
  VirtualBox_SOURCES           += VirtualBoxMac.qrc
  VirtualBoxMac.qrc_RCCFLAGS    = -name MAC

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp

@@ -242 +242 @@
     /* Test if HiDPI icons are enabled. Works only with a patched version of Qt 4.x
      * with the changes from https://codereview.qt-project.org/#change,54636 applied. */
-    if (qApp->testAttribute(Qt::AA_UseHighDpiPixmaps))
-    {
-        /* Parse name to prefix and suffix: */
-        QString strPrefix = strName.section('.', 0, -2);
-        QString strSuffix = strName.section('.', -1, -1);
-        /* Prepare HiDPI pixmap on the basis of values above: */
-        QPixmap pixmapHiDPI(strPrefix + "_hidpi." + strSuffix);
-        /* Add HiDPI pixmap (if any): */
-        if (!pixmapHiDPI.isNull())
-            icon.addPixmap(pixmapHiDPI, mode, state);
-    }
+    if (!qApp->testAttribute(Qt::AA_UseHighDpiPixmaps))
+        return;
 # endif /* VBOX_GUI_WITH_HIDPI */
+    /* Otherwise HiDPI icons are useless: */
+    return;
 #endif /* Q_WS_MAC */
+
+    /* Parse name to prefix and suffix: */
+    QString strPrefix = strName.section('.', 0, -2);
+    QString strSuffix = strName.section('.', -1, -1);
+    /* Prepare HiDPI pixmap on the basis of values above: */
+    QPixmap pixmapHiDPI(strPrefix + "_hidpi." + strSuffix);
+    /* Add HiDPI pixmap (if any): */
+    if (!pixmapHiDPI.isNull())
+        icon.addPixmap(pixmapHiDPI, mode, state);
 }