Changeset 106570 in vbox for trunk/src

Timestamp:

Oct 21, 2024 3:23:32 PM (4 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10767: VM settings / Display page: Cleanup for VRAM editor, VRAM requirements calculation.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIVideoMemoryEditor.cpp (modified) (5 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIVideoMemoryEditor.cpp

@@ -69 +69 @@
     if (m_iValue != iValue)
     {
-        m_iValue = RT_MIN(iValue, m_iMaxVRAM);
+        m_iValue = qMin(iValue, m_iMaxVRAM);
         if (m_pSlider)
             m_pSlider->setValue(m_iValue);
@@ -314 +314 @@
         return;
 
-    /* Init visible maximum VRAM: */
+    /* Init recommended VRAM according to guest OS type and screen count: */
+    int iNeedMBytes = UIGuestOSTypeHelpers::requiredVideoMemory(m_strGuestOSTypeId, m_cGuestScreenCount) / _1M;
+
+    /* Init visible maximum VRAM to be no less than 32MB per screen: */
     int iMaxVRAMVisible = m_cGuestScreenCount * 32;
-
-    /* Get monitors count and recommended VRAM: */
-    int iNeedMBytes = UIGuestOSTypeHelpers::requiredVideoMemory(m_strGuestOSTypeId, m_cGuestScreenCount) / _1M;
-
     /* Adjust visible maximum VRAM to be no less than 128MB (if possible): */
     if (iMaxVRAMVisible < 128 && m_iMaxVRAM >= 128)
@@ -329 +328 @@
         /* Adjust recommended VRAM to be no less than 128MB: */
         iNeedMBytes = qMax(iNeedMBytes, 128);
+
         /* Adjust visible maximum VRAM to be no less than 256MB (if possible): */
         if (iMaxVRAMVisible < 256 && m_iMaxVRAM >= 256)
@@ -334 +334 @@
     }
 #endif /* VBOX_WITH_3D_ACCELERATION */
+
+    /* Adjust recommended VRAM to be no more than actual maximum VRAM: */
+    iNeedMBytes = qMin(iNeedMBytes, m_iMaxVRAM);
 
     /* Adjust visible maximum VRAM to be no less than initial VRAM: */
@@ -339 +342 @@
     /* Adjust visible maximum VRAM to be no less than recommended VRAM: */
     iMaxVRAMVisible = qMax(iMaxVRAMVisible, iNeedMBytes);
-
-    /* Adjust recommended VRAM to be no more than actual maximum VRAM: */
-    iNeedMBytes = qMin(iNeedMBytes, m_iMaxVRAM);
     /* Adjust visible maximum VRAM to be no more than actual maximum VRAM: */
     iMaxVRAMVisible = qMin(iMaxVRAMVisible, m_iMaxVRAM);