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

Timestamp:

Jul 3, 2018 9:49:09 AM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8694: Adjust icons when moving GUI between screen with different DPI: UIPopupBox.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/widgets

Files:

• UIPopupBox.cpp (modified) (3 diffs)
• UIPopupBox.h (modified) (1 diff)

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

@@ -239 +239 @@
 {
     return m_fOpened;
+}
+
+bool UIPopupBox::event(QEvent *pEvent)
+{
+    /* Handle know event types: */
+    switch (pEvent->type())
+    {
+        case QEvent::Show:
+        case QEvent::ScreenChangeInternal:
+        {
+            /* Update pixmaps: */
+            updateTitleIcon();
+            updateWarningIcon();
+            break;
+        }
+        default:
+            break;
+    }
+
+    /* Call to base-class: */
+    return QWidget::event(pEvent);
 }
 
@@ -316 +337 @@
 {
     /* Assign title-icon: */
-    const QStyle *pStyle = QApplication::style();
-    const int iIconMetric = pStyle->pixelMetric(QStyle::PM_SmallIconSize);
-    m_pTitleIcon->setPixmap(m_titleIcon.pixmap(iIconMetric, iIconMetric));
+    const int iIconMetric = QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize);
+    m_pTitleIcon->setPixmap(m_titleIcon.pixmap(window()->windowHandle(), QSize(iIconMetric, iIconMetric)));
 }
 
@@ -325 +345 @@
     /* Hide warning-icon if its null: */
     m_pWarningIcon->setHidden(m_warningIcon.isNull());
+
     /* Assign warning-icon: */
-    const QStyle *pStyle = QApplication::style();
-    const int iIconMetric = pStyle->pixelMetric(QStyle::PM_SmallIconSize);
-    m_pWarningIcon->setPixmap(m_warningIcon.pixmap(iIconMetric, iIconMetric));
+    const int iIconMetric = QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize);
+    m_pWarningIcon->setPixmap(m_warningIcon.pixmap(window()->windowHandle(), QSize(iIconMetric, iIconMetric)));
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h

@@ -106 +106 @@
 
 protected:
+
+    /** Handles any Qt @a pEvent. */
+    virtual bool event(QEvent *pEvent) /* override */;
 
     /** Pre-handles standard Qt @a pEvent for passed @a pObject. */