Changeset 69708 in vbox for trunk

Timestamp:

Nov 16, 2017 9:36:04 AM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8694: Selector UI: HiDPI support fix for graphics-VM-preview used in details pane: Make sure scaling ratio is within the actual bounds (s.a. r119006).

Location:

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details

Files:

• UIGMachinePreview.cpp (modified) (1 diff)
• UIGMachinePreview.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGMachinePreview.cpp

@@ -67 +67 @@
     const QIcon full16x9 = UIIconPool::iconSet(":/preview_full_16to9_242x155px.png");
     const QIcon full4x3 = UIIconPool::iconSet(":/preview_full_4to3_242x192px.png");
+
+    // WORKAROUND:
+    // Since we don't have x3 and x4 HiDPI icons yet,
+    // and we hadn't enabled automatic up-scaling for now,
+    // we have to make sure m_dRatio is within possible bounds.
+    const QList<QSize> sizes = empty16x10.availableSizes();
+    if (sizes.size() >= 2)
+        m_dRatio = qMin(m_dRatio, (double)sizes.last().width() / sizes.first().width());
+
     m_sizes.insert(AspectRatioPreset_16x10, QSize(242 * m_dRatio, 167 * m_dRatio));
     m_sizes.insert(AspectRatioPreset_16x9, QSize(242 * m_dRatio, 155 * m_dRatio));

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGMachinePreview.h

@@ -113 +113 @@
     QMenu *m_pUpdateTimerMenu;
     QHash<PreviewUpdateIntervalType, QAction*> m_actions;
-    const double m_dRatio;
+    double m_dRatio;
     const int m_iMargin;
     QRect m_vRect;