Changeset 72824 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jul 3, 2018 2:33:58 PM (7 years ago)

Author:

vboxsync

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

123369

Message:

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

File:

• trunk/src/VBox/Frontends/VirtualBox/src/selector/UIDesktopPane.cpp (modified) (10 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/selector/UIDesktopPane.cpp

@@ -131 +131 @@
     void prepare();
 
+    /** Updates pixmap. */
+    void updatePixmap();
+
     /** Holds the action reference. */
     QAction *m_pAction;
@@ -180 +183 @@
 protected:
 
+    /** Handles any Qt @a pEvent. */
+    virtual bool event(QEvent *pEvent) /* override */;
+
     /** Handles translation event. */
     void retranslateUi();
@@ -188 +194 @@
     /** Prepares tools pane. */
     void prepareToolsPane();
+
+    /** Updates pixmap. */
+    void updatePixmap();
 
 private:
@@ -212 +221 @@
     /** Holds the tools pane icon label instance. */
     QLabel           *m_pLabelToolsPaneIcon;
+
+    /** Holds the tools pane icon instance. */
+    QIcon  m_icon;
 };
 
@@ -308 +320 @@
     switch (pEvent->type())
     {
+        case QEvent::Show:
+        case QEvent::ScreenChangeInternal:
+        {
+            /* Update pixmap: */
+            updatePixmap();
+            break;
+        }
+
         /* Update the hovered state on/off: */
         case QEvent::Enter:
@@ -493 +513 @@
             /* Configure label: */
             m_pLabelIcon->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
-            m_pLabelIcon->setPixmap(m_pAction->icon().pixmap(iMetric));
 
             /* Add into layout: */
@@ -500 +519 @@
         }
     }
+
+    /* Update pixmap: */
+    updatePixmap();
+}
+
+void UIToolWidget::updatePixmap()
+{
+    const int iMetric = QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize) * 1.375;
+    m_pLabelIcon->setPixmap(m_pAction->icon().pixmap(window()->windowHandle(), QSize(iMetric, iMetric)));
 }
 
@@ -546 +574 @@
     prepareToolsPane();
 
-    /* Assign corresponding icon: */
-    const QList<QSize> aSizes = icon.availableSizes();
-    const QSize firstOne = aSizes.isEmpty() ? QSize(200, 200) : aSizes.first();
-    const double dRatio = QApplication::style()->pixelMetric(QStyle::PM_LargeIconSize) / 32;
-    m_pLabelToolsPaneIcon->setPixmap(icon.pixmap(QSize(firstOne.width() * dRatio, firstOne.height() * dRatio)));
+    /* Save icon: */
+    m_icon = icon;
+    /* Update pixmap: */
+    updatePixmap();
 
     /* Raise corresponding widget: */
@@ -585 +612 @@
         delete pChild;
     }
+}
+
+bool UIDesktopPanePrivate::event(QEvent *pEvent)
+{
+    /* Handle know event types: */
+    switch (pEvent->type())
+    {
+        case QEvent::Show:
+        case QEvent::ScreenChangeInternal:
+        {
+            /* Update pixmap: */
+            updatePixmap();
+            break;
+        }
+        default:
+            break;
+    }
+
+    /* Call to base-class: */
+    return QIWithRetranslateUI<QStackedWidget>::event(pEvent);
 }
 
@@ -743 +790 @@
 }
 
+void UIDesktopPanePrivate::updatePixmap()
+{
+    /* Assign corresponding icon: */
+    const QList<QSize> aSizes = m_icon.availableSizes();
+    const QSize firstOne = aSizes.isEmpty() ? QSize(200, 200) : aSizes.first();
+    const double dRatio = QApplication::style()->pixelMetric(QStyle::PM_LargeIconSize) / 32;
+    m_pLabelToolsPaneIcon->setPixmap(m_icon.pixmap(window()->windowHandle(), QSize(firstOne.width() * dRatio, firstOne.height() * dRatio)));
+}
+
 
 /*********************************************************************************************************************************