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

Timestamp:

Jul 4, 2018 9:28:36 AM (6 years ago)

Author:

vboxsync

Message:

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

File:

• trunk/src/VBox/Frontends/VirtualBox/src/selector/UISnapshotDetailsWidget.cpp (modified) (8 diffs)

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

@@ -77 +77 @@
 
     /** Constructs details element passing @a pParent to the base-class.
+      * @param  strName       Brings the element name.
+      * @param  icon          Brings the element icon.
       * @param  fLinkSupport  Brings whether we should construct text-browser
       *                       instead of simple text-edit otherwise. */
-    UISnapshotDetailsElement(bool fLinkSupport, QWidget *pParent = 0);
+    UISnapshotDetailsElement(const QString &strName, const QIcon &icon,
+                             bool fLinkSupport, QWidget *pParent = 0);
 
     /** Returns underlying text-document. */
@@ -92 +95 @@
 protected:
 
+    /** Handles any Qt @a pEvent. */
+    virtual bool event(QEvent *pEvent) /* override */;
+
     /** Handles paint @a pEvent. */
     virtual void paintEvent(QPaintEvent *pEvent) /* override */;
@@ -100 +106 @@
     void prepare();
 
+    /** Updates pixmap. */
+    void updatePixmap();
+
+    /** Holds the element name.*/
+    QString  m_strName;
+    /** Holds the element icon. */
+    QIcon    m_icon;
     /** Holds whether we should construct text-browser
       * instead of simple text-edit otherwise. */
-    bool  m_fLinkSupport;
+    bool     m_fLinkSupport;
 
     /** Holds the text-edit interface instance. */
@@ -178 +191 @@
 *********************************************************************************************************************************/
 
-UISnapshotDetailsElement::UISnapshotDetailsElement(bool fLinkSupport, QWidget *pParent /* = 0 */)
+UISnapshotDetailsElement::UISnapshotDetailsElement(const QString &strName, const QIcon &icon,
+                                                   bool fLinkSupport, QWidget *pParent /* = 0 */)
     : QWidget(pParent)
+    , m_strName(strName)
+    , m_icon(icon)
     , m_fLinkSupport(fLinkSupport)
     , m_pTextEdit(0)
@@ -212 +228 @@
     const int iIdealHeight = size.height() + 2 * iDocumentMargin + iTop + iBottom;
     return QSize(iIdealWidth, iIdealHeight);
+}
+
+bool UISnapshotDetailsElement::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 QWidget::event(pEvent);
 }
 
@@ -327 +363 @@
         }
     }
+
+    /* Update pixmap: */
+    updatePixmap();
+}
+
+void UISnapshotDetailsElement::updatePixmap()
+{
+    /* Re-register icon in the element's text-document: */
+    const int iMetric = QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize);
+    document()->addResource(
+        QTextDocument::ImageResource,
+        QUrl(QString("details://%1").arg(m_strName)),
+        QVariant(m_icon.pixmap(window()->windowHandle(), QSize(iMetric, iMetric))));
 }
 
@@ -1003 +1052 @@
     /* Create element: */
     const bool fWithHypertextNavigation = enmType == DetailsElementType_Preview;
-    UISnapshotDetailsElement *pElement = new UISnapshotDetailsElement(fWithHypertextNavigation);
+    UISnapshotDetailsElement *pElement = new UISnapshotDetailsElement(gpConverter->toInternalString(enmType),
+                                                                      gpConverter->toIcon(enmType),
+                                                                      fWithHypertextNavigation);
     AssertPtrReturn(pElement, 0);
     {
@@ -1016 +1067 @@
                 break;
         }
-
-        /* Register DetailsElementType icon in the element text-document: */
-        const int iIconMetric = QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize);
-        const QSize iconSize = QSize(iIconMetric, iIconMetric);
-        pElement->document()->addResource(
-            QTextDocument::ImageResource,
-            QUrl(QString("details://%1").arg(gpConverter->toInternalString(enmType))),
-            QVariant(gpConverter->toIcon(enmType).pixmap(iconSize)));
     }
     /* Return element: */