Changeset 103121 in vbox for trunk

Timestamp:

Jan 30, 2024 12:29:34 PM (13 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

161368

Message:

FE/Qt: HiDPI support for various label icons in QILineEdit, UIToolBox and UIWizardNewVM.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extensions/QILineEdit.cpp (modified) (2 diffs)
• widgets/UIToolBox.cpp (modified) (3 diffs)
• wizards/newvm/UIWizardNewVMNameOSTypePage.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QILineEdit.cpp

@@ -34 +34 @@
 #include <QMenu>
 #include <QStyleOptionFrame>
-#include <QWindow>
 
 /* GUI includes: */
 #include "QILineEdit.h"
+#include "UIDesktopWidgetWatchdog.h"
 #include "UIIconPool.h"
 
@@ -242 +242 @@
 void UIMarkableLineEdit::mark(bool fError, const QString &strErrorMessage /* = QString() */)
 {
+    AssertPtrReturnVoid(m_pIconLabel);
     m_pIconLabel->setVisible(true);
-    AssertReturnVoid(m_pIconLabel);
+    const QIcon icon = fError ? UIIconPool::iconSet(":/status_error_16px.png") : UIIconPool::iconSet(":/status_check_16px.png");
     const int iIconMetric = QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize);
-    const qreal fDevicePixelRatio = window() && window()->windowHandle() ? window()->windowHandle()->devicePixelRatio() : 1;
-    if (fError)
-        m_pIconLabel->setPixmap(UIIconPool::iconSet(":/status_error_16px.png").pixmap(QSize(iIconMetric, iIconMetric), fDevicePixelRatio));
-    else
-        m_pIconLabel->setPixmap(UIIconPool::iconSet(":/status_check_16px.png").pixmap(QSize(iIconMetric, iIconMetric), fDevicePixelRatio));
+    const qreal fDevicePixelRatio = gpDesktop->devicePixelRatio(m_pIconLabel);
+    m_pIconLabel->setPixmap(icon.pixmap(QSize(iIconMetric, iIconMetric), fDevicePixelRatio));
     m_pIconLabel->setToolTip(strErrorMessage);
 }

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIToolBox.cpp

@@ -32 +32 @@
 #include <QStyle>
 #include <QVBoxLayout>
-#include <QWindow>
 
 /* GUI includes: */
@@ -38 +37 @@
 #include "QIToolButton.h"
 #include "UICommon.h"
+#include "UIDesktopWidgetWatchdog.h"
 #include "UIIconPool.h"
 #include "UIToolBox.h"
@@ -296 +296 @@
         return;
     }
-    const int iMetric = QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize);
-    const qreal fDevicePixelRatio = window() && window()->windowHandle() ? window()->windowHandle()->devicePixelRatio() : 1;
-    m_pIconLabel->setPixmap(icon.pixmap(QSize(iMetric, iMetric), fDevicePixelRatio));
+    const int iIconMetric = QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize);
+    const qreal fDevicePixelRatio = gpDesktop->devicePixelRatio(m_pIconLabel);
+    m_pIconLabel->setPixmap(icon.pixmap(QSize(iIconMetric, iIconMetric), fDevicePixelRatio));
     m_pIconLabel->setToolTip(strToolTip);
 }

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMNameOSTypePage.cpp

@@ -29 +29 @@
 #include <QCheckBox>
 #include <QDir>
+#include <QStyle>
 #include <QRegularExpression>
 #include <QVBoxLayout>
@@ -35 +36 @@
 #include "QIRichTextLabel.h"
 #include "UICommon.h"
+#include "UIDesktopWidgetWatchdog.h"
+#include "UIIconPool.h"
 #include "UINameAndSystemEditor.h"
 #include "UINotificationCenter.h"
@@ -567 +570 @@
     }
 
-    m_pInfoLabel->setText(QString("<img src=\":/session_info_16px.png\" style=\"vertical-align:top\"> %1").arg(strMessage));
+    const QIcon icon = UIIconPool::iconSet(":/session_info_16px.png");
+    const int iIconMetric = QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize);
+    const qreal fDevicePixelRatio = gpDesktop->devicePixelRatio(m_pInfoLabel);
+    m_pInfoLabel->registerPixmap(icon.pixmap(QSize(iIconMetric, iIconMetric), fDevicePixelRatio), "wizard://info");
+    m_pInfoLabel->setText(QString("<img src='wizard://info' style=\"vertical-align:top\"> %1").arg(strMessage));
 }