Changeset 58343 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Oct 20, 2015 3:16:57 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: Mac OS X: Runtime UI: Make sure dock icon state overlay is HiDPI aware.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/UIAbstractDockIconPreview.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/UIAbstractDockIconPreview.cpp

@@ -20 +20 @@
 #else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
-/* VBox includes */
+/* Qt includes: */
+#include <QStyle>
+
+/* GUI includes: */
 # include "UIAbstractDockIconPreview.h"
 # include "UIFrameBuffer.h"
 # include "UIMachineLogic.h"
 # include "UIMachineView.h"
+# include "UIConverter.h"
 # include "UISession.h"
+
+/* COM includes: */
+# include "COMEnums.h"
 
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
@@ -66 +73 @@
     Assert(m_overlayImage);
 
-    m_statePaused    = ::darwinToCGImageRef("state_paused_16px.png");
+    /* Determine desired icon size for the state-overlay: */
+    const QStyle *pStyle = QApplication::style();
+    const int iIconMetric = pStyle->pixelMetric(QStyle::PM_SmallIconSize);
+    const QSize iconSize = QSize(iIconMetric, iIconMetric);
+
+    /* Prepare 'Paused' state-overlay: */
+    const QPixmap statePaused = gpConverter->toIcon(KMachineState_Paused).pixmap(iconSize);
+    m_statePaused = ::darwinToCGImageRef(&statePaused);
     Assert(m_statePaused);
-    m_stateSaving    = ::darwinToCGImageRef("state_saving_16px.png");
+
+    /* Prepare 'Saving' state-overlay: */
+    const QPixmap stateSaving = gpConverter->toIcon(KMachineState_Saving).pixmap(iconSize);
+    m_stateSaving = ::darwinToCGImageRef(&stateSaving);
     Assert(m_stateSaving);
-    m_stateRestoring = ::darwinToCGImageRef("state_restoring_16px.png");
+
+    /* Prepare 'Restoring' state-overlay: */
+    const QPixmap stateRestoring = gpConverter->toIcon(KMachineState_Restoring).pixmap(iconSize);
+    m_stateRestoring = ::darwinToCGImageRef(&stateRestoring);
     Assert(m_stateRestoring);
 }