Changeset 69698 in vbox for trunk

Timestamp:

Nov 15, 2017 9:21:29 AM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8694: HiDPI support for close VM dialog.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIMachineWindow.cpp (modified) (1 diff)
• UIVMCloseDialog.cpp (modified) (7 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineWindow.cpp

@@ -314 +314 @@
         /* Configure close-dialog: */
         if (uisession() && uisession()->machineWindowIcon())
-            pCloseDlg->setPixmap(uisession()->machineWindowIcon()->pixmap(QSize(32, 32)));
+        {
+            const int iIconMetric = QApplication::style()->pixelMetric(QStyle::PM_LargeIconSize);
+            pCloseDlg->setPixmap(uisession()->machineWindowIcon()->pixmap(QSize(iIconMetric, iIconMetric)));
+        }
 
         /* Make sure close-dialog is valid: */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIVMCloseDialog.cpp

@@ -30 +30 @@
 
 /* GUI includes: */
+# include "UIIconPool.h"
 # include "UIVMCloseDialog.h"
 # include "UIExtraDataManager.h"
@@ -184 +185 @@
                     /* Configure icon: */
                     m_pIcon->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
-                    m_pIcon->setPixmap(QPixmap(":/os_unknown.png"));
+                    const int iIconMetric = QApplication::style()->pixelMetric(QStyle::PM_LargeIconSize);
+                    const QIcon icon = UIIconPool::iconSet(":/os_unknown.png");
+                    m_pIcon->setPixmap(icon.pixmap(iIconMetric, iIconMetric));
                 }
                 /* Configure layout: */
@@ -200 +203 @@
                 QGridLayout *pChoiceLayout = new QGridLayout;
                 {
+                    /* Prepare icon metric: */
+                    const int iIconMetric = QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize);
                     /* Prepare 'detach' icon: */
                     m_pDetachIcon = new QLabel(this);
@@ -205 +210 @@
                         /* Configure icon: */
                         m_pDetachIcon->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
-                        m_pDetachIcon->setPixmap(QPixmap(":/vm_create_shortcut_16px.png"));
+                        const QIcon icon = UIIconPool::iconSet(":/vm_create_shortcut_16px.png");
+                        m_pDetachIcon->setPixmap(icon.pixmap(iIconMetric, iIconMetric));
                     }
                     /* Prepare 'detach' radio-button: */
@@ -219 +225 @@
                         /* Configure icon: */
                         m_pSaveIcon->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
-                        m_pSaveIcon->setPixmap(QPixmap(":/vm_save_state_16px.png"));
+                        const QIcon icon = UIIconPool::iconSet(":/vm_save_state_16px.png");
+                        m_pSaveIcon->setPixmap(icon.pixmap(iIconMetric, iIconMetric));
                     }
                     /* Prepare 'save' radio-button: */
@@ -233 +240 @@
                         /* Configure icon: */
                         m_pShutdownIcon->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
-                        m_pShutdownIcon->setPixmap(QPixmap(":/vm_shutdown_16px.png"));
+                        const QIcon icon = UIIconPool::iconSet(":/vm_shutdown_16px.png");
+                        m_pShutdownIcon->setPixmap(icon.pixmap(iIconMetric, iIconMetric));
                     }
                     /* Prepare 'shutdown' radio-button: */
@@ -247 +255 @@
                         /* Configure icon: */
                         m_pPowerOffIcon->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
-                        m_pPowerOffIcon->setPixmap(QPixmap(":/vm_poweroff_16px.png"));
+                        const QIcon icon = UIIconPool::iconSet(":/vm_poweroff_16px.png");
+                        m_pPowerOffIcon->setPixmap(icon.pixmap(iIconMetric, iIconMetric));
                     }
                     /* Prepare 'shutdown' radio-button: */