Changeset 72704 in vbox

Timestamp:

Jun 27, 2018 3:38:30 PM (7 years ago)

Author:

vboxsync

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

123233

Message:

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

Location:

trunk/src/VBox/Frontends/VirtualBox/src/selector

Files:

• UIVMItem.cpp (modified) (3 diffs)
• UIVMItem.h (modified) (1 diff)
• graphics/chooser/UIGChooserItemMachine.cpp (modified) (3 diffs)
• graphics/chooser/UIGChooserItemMachine.h (modified) (1 diff)

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

@@ -243 +243 @@
         m_cSnaphot = m_machine.GetSnapshotCount();
 
-        m_pixmap = vboxGlobal().vmUserPixmapDefault(m_machine, &m_logicalPixmapSize);
-        if (m_pixmap.isNull())
-            m_pixmap = vboxGlobal().vmGuestOSTypePixmapDefault(m_strOSTypeId, &m_logicalPixmapSize);
-
         m_groups = m_machine.GetGroups().toList();
 
@@ -297 +293 @@
         m_cSnaphot = 0;
 
-        m_pixmap = vboxGlobal().vmGuestOSTypePixmapDefault("Other", &m_logicalPixmapSize);
         m_groups.clear();
         m_pid = (ULONG) ~0;
@@ -312 +307 @@
     }
 
+    /* Recache item pixmap: */
+    recachePixmap();
+
     return needsResort;
+}
+
+void UIVMItem::recachePixmap()
+{
+    /* If machine is accessible: */
+    if (m_fAccessible)
+    {
+        /* First, we are trying to acquire personal machine guest OS type icon: */
+        m_pixmap = vboxGlobal().vmUserPixmapDefault(m_machine, &m_logicalPixmapSize);
+        /* If there is nothing, we are using icon corresponding to cached guest OS type: */
+        if (m_pixmap.isNull())
+            m_pixmap = vboxGlobal().vmGuestOSTypePixmapDefault(m_strOSTypeId, &m_logicalPixmapSize);
+    }
+    /* Otherwise: */
+    else
+    {
+        /* We are using "Other" guest OS type icon: */
+        m_pixmap = vboxGlobal().vmGuestOSTypePixmapDefault("Other", &m_logicalPixmapSize);
+    }
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMItem.h

@@ -67 +67 @@
     const QStringList &groups();
     bool recache();
+    /** Recaches item pixmap. */
+    void recachePixmap();
 
     bool canSwitchTo() const;

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserItemMachine.cpp

@@ -26 +26 @@
 
 /* GUI includes: */
+# include "UIGChooser.h"
 # include "UIGChooserItemMachine.h"
 # include "UIGChooserItemGroup.h"
@@ -254 +255 @@
     AssertReturnVoid(!stateIcon.isNull());
     const QSize statePixmapSize = QSize(iIconMetric, iIconMetric);
-    const QPixmap statePixmap = stateIcon.pixmap(statePixmapSize);
+    const QPixmap statePixmap = stateIcon.pixmap(model()->chooser()->window()->windowHandle(), statePixmapSize);
     /* Update linked values: */
     if (m_statePixmapSize != statePixmapSize)
@@ -810 +811 @@
 {
     return new UIGChooserItemMimeData(this);
+}
+
+void UIGChooserItemMachine::showEvent(QShowEvent *pEvent)
+{
+    /* Call to base-class: */
+    UIGChooserItem::showEvent(pEvent);
+
+    /* Recache and update pixmaps: */
+    recachePixmap();
+    updatePixmaps();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserItemMachine.h

@@ -139 +139 @@
     QMimeData* createMimeData();
 
+    /** Handles show @a pEvent. */
+    virtual void showEvent(QShowEvent *pEvent) /* override */;
+
     /* Handler: Resize handling stuff: */
     void resizeEvent(QGraphicsSceneResizeEvent *pEvent);