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

Timestamp:

Jul 3, 2018 9:41:00 AM (7 years ago)

Author:

vboxsync

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

123357

Message:

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

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• UITakeSnapshotDialog.cpp (modified) (3 diffs)
• UITakeSnapshotDialog.h (modified) (4 diffs)
• runtime/UIMachineLogic.cpp (modified) (1 diff)
• selector/UISnapshotPane.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/UITakeSnapshotDialog.cpp

@@ -58 +58 @@
 }
 
-void UITakeSnapshotDialog::setPixmap(const QPixmap &pixmap)
-{
-    m_pLabelIcon->setPixmap(pixmap);
+void UITakeSnapshotDialog::setIcon(const QIcon &icon)
+{
+    m_icon = icon;
+    updatePixmap();
 }
 
@@ -76 +77 @@
 {
     return m_pEditorDescription->toPlainText();
+}
+
+bool UITakeSnapshotDialog::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<QIDialog>::event(pEvent);
 }
 
@@ -273 +294 @@
     }
 }
+
+void UITakeSnapshotDialog::updatePixmap()
+{
+    const int iIconMetric = QApplication::style()->pixelMetric(QStyle::PM_LargeIconSize);
+    m_pLabelIcon->setPixmap(m_icon.pixmap(windowHandle(), QSize(iIconMetric, iIconMetric)));
+}

trunk/src/VBox/Frontends/VirtualBox/src/UITakeSnapshotDialog.h

@@ -18 +18 @@
 #ifndef ___UITakeSnapshotDialog_h___
 #define ___UITakeSnapshotDialog_h___
+
+/* Qt includes: */
+#include <QIcon>
 
 /* GUI includes: */
@@ -43 +46 @@
     UITakeSnapshotDialog(QWidget *pParent, const CMachine &comMachine);
 
-    /** Defines snapshot @a pixmap. */
-    void setPixmap(const QPixmap &pixmap);
+    /** Defines snapshot @a icon. */
+    void setIcon(const QIcon &icon);
 
     /** Defines snapshot @a strName. */
@@ -55 +58 @@
 
 protected:
+
+    /** Handles any Qt @a pEvent. */
+    virtual bool event(QEvent *pEvent) /* override */;
 
     /** Handles translation event. */
@@ -71 +77 @@
     void prepareContents();
 
+    /** Updates pixmap. */
+    void updatePixmap();
+
     /** Holds the wrapper of machine to take snapshot for. */
     const CMachine &m_comMachine;
+
+    /** Holds the snapshot icon. */
+    QIcon m_icon;
 
     /** Holds the amount of immutable attachments. */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp

@@ -1690 +1690 @@
     /* Assign corresponding icon: */
     if (uisession() && uisession()->machineWindowIcon())
-    {
-        const int iIconMetric = QApplication::style()->pixelMetric(QStyle::PM_LargeIconSize);
-        pDlg->setPixmap(uisession()->machineWindowIcon()->pixmap(QSize(iIconMetric, iIconMetric)));
-    }
+        pDlg->setIcon(*uisession()->machineWindowIcon());
 
     /* Search for the max available filter index: */

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

@@ -1604 +1604 @@
 
                 /* Assign corresponding icon: */
-                QPixmap pixmap = vboxGlobal().vmUserPixmapDefault(comMachine);
-                if (pixmap.isNull())
-                    pixmap = vboxGlobal().vmGuestOSTypePixmapDefault(comMachine.GetOSTypeId());
-                pDlg->setPixmap(pixmap);
+                QIcon icon = vboxGlobal().vmUserIcon(comMachine);
+                if (icon.isNull())
+                    icon = vboxGlobal().vmGuestOSTypeIcon(comMachine.GetOSTypeId());
+                pDlg->setIcon(icon);
 
                 /* Assign corresponding snapshot name: */