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

Timestamp:

Feb 14, 2018 11:21:33 AM (7 years ago)

Author:

vboxsync

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

120853

Message:

FE/Qt: bugref:9119: A try to fix a crash while opening New VM wizard and all similar places which uses similar code piece.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxAboutDlg.cpp (modified) (1 diff)
• extradata/UIExtraDataManager.cpp (modified) (1 diff)
• globals/UIIconPool.cpp (modified) (1 diff)
• medium/UIMedium.cpp (modified) (1 diff)
• platform/darwin/UICocoaSpecialControls.mm (modified) (1 diff)
• settings/UISettingsSerializer.cpp (modified) (1 diff)
• wizards/UIWizard.cpp (modified) (2 diffs)

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

@@ -128 +128 @@
     const double dRatio = (double)iIconMetric / 32;
     const QIcon icon = UIIconPool::iconSet(strPath);
-    m_size = icon.availableSizes().first();
+    m_size = icon.availableSizes().value(0, QSize(640, 480));
     m_size *= dRatio;
     m_pixmap = icon.pixmap(m_size);

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp

@@ -417 +417 @@
         /* For global ID we return static pixmap/size: */
         const QIcon icon = UIIconPool::iconSet(":/edataglobal_32px.png");
-        pixmapSize = icon.availableSizes().first();
+        pixmapSize = icon.availableSizes().value(0, QSize(32, 32));
         pixmap = icon.pixmap(pixmapSize);
     }

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp

@@ -47 +47 @@
 
     /* Return pixmap of first available size: */
-    return icon.pixmap(icon.availableSizes().first());
+    const int iHint = QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize);
+    return icon.pixmap(icon.availableSizes().value(0, QSize(iHint, iHint)));
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMedium.cpp

@@ -473 +473 @@
     {
         QIcon icon = UIIconPool::iconSet(":/hd_new_16px.png");
-        pixmap = VBoxGlobal::joinPixmaps(pixmap, icon.pixmap(icon.availableSizes().first()));
+        pixmap = VBoxGlobal::joinPixmaps(pixmap, icon.pixmap(icon.availableSizes().value(0, QSize(16, 16))));
     }
 

trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/UICocoaSpecialControls.mm

@@ -598 +598 @@
 void UICocoaSegmentedButton::setIcon(int iSegment, const QIcon& icon)
 {
-    QImage image = toGray(icon.pixmap(icon.availableSizes().first()).toImage());
+    QImage image = toGray(icon.pixmap(icon.availableSizes().value(0, QSize(16, 16))).toImage());
 
     NSImage *pNSimage = [::darwinToNSImageRef(&image) autorelease];

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsSerializer.cpp

@@ -266 +266 @@
                     /* Configure label: */
                     const QIcon icon = UIIconPool::iconSet(":/progress_settings_90px.png");
-                    pLabelPixmap->setPixmap(icon.pixmap(icon.availableSizes().first()));
+                    pLabelPixmap->setPixmap(icon.pixmap(icon.availableSizes().value(0, QSize(90, 90))));
                     /* Add label into layout: */
                     pLayoutPixmap->addWidget(pLabelPixmap);

trunk/src/VBox/Frontends/VirtualBox/src/wizards/UIWizard.cpp

@@ -254 +254 @@
         /* Load pixmap to icon first: */
         QIcon icon = UIIconPool::iconSet(m_strWatermarkName);
-        QSize size = icon.availableSizes().first();
+        QSize size = icon.availableSizes().value(0, QSize(145, 290));
         size *= dRatio;
         /* We should take into account watermark like its assigned already: */
@@ -491 +491 @@
     /* Load pixmap to icon first: */
     QIcon icon = UIIconPool::iconSet(m_strWatermarkName);
-    QSize size = icon.availableSizes().first();
+    QSize size = icon.availableSizes().value(0, QSize(145, 290));
     size *= dRatio;
     /* Create initial watermark: */