Changeset 106566 in vbox for trunk/src

Timestamp:

Oct 21, 2024 3:00:09 PM (6 weeks ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10767: VM settings / Display page: Cleanup for VRAM editor; No need to cache max VRAM visible size as we are using it in one place only.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIGuestOSType.cpp (modified) (1 diff)
• settings/editors/UIVideoMemoryEditor.cpp (modified) (8 diffs)
• settings/editors/UIVideoMemoryEditor.h (modified) (1 diff)

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

@@ -89 +89 @@
     {
         /* Calculate summary required memory amount in bits: */
-        uNeedBits += (screenSize.at(i) * /* with x height */
+        uNeedBits += (screenSize.at(i) * /* width x height */
                      32 + /* we will take the maximum possible bpp for now */
                      8 * _1M) + /* current cache per screen - may be changed in future */

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

@@ -54 +54 @@
     , m_iMinVRAM(0)
     , m_iMaxVRAM(0)
-    , m_iMaxVRAMVisible(0)
     , m_pLayout(0)
     , m_pLabelMemory(0)
@@ -189 +188 @@
     if (m_pLabelMemoryMax)
     {
-        m_pLabelMemoryMax->setText(tr("%1 MB").arg(m_iMaxVRAMVisible));
+        m_pLabelMemoryMax->setText(tr("%1 MB").arg(m_iMaxVRAM));
         m_pLabelMemoryMax->setToolTip(tr("Maximum possible video memory size."));
     }
@@ -228 +227 @@
     m_iMinVRAM = comProperties.GetMinGuestVRAM();
     m_iMaxVRAM = comProperties.GetMaxGuestVRAM();
-    m_iMaxVRAMVisible = m_iMaxVRAM;
 
     /* Create main layout: */
@@ -255 +253 @@
             {
                 m_pSlider->setMinimum(m_iMinVRAM);
-                m_pSlider->setMaximum(m_iMaxVRAMVisible);
-                m_pSlider->setPageStep(calculatePageStep(m_iMaxVRAMVisible));
+                m_pSlider->setMaximum(m_iMaxVRAM);
+                m_pSlider->setPageStep(calculatePageStep(m_iMaxVRAM));
                 m_pSlider->setSingleStep(m_pSlider->pageStep() / 4);
                 m_pSlider->setTickInterval(m_pSlider->pageStep());
@@ -302 +300 @@
                 m_pLabelMemory->setBuddy(m_pSpinBox);
             m_pSpinBox->setMinimum(m_iMinVRAM);
-            m_pSpinBox->setMaximum(m_iMaxVRAMVisible);
+            m_pSpinBox->setMaximum(m_iMaxVRAM);
             connect(m_pSpinBox, &QSpinBox::valueChanged,
                     this, &UIVideoMemoryEditor::sltHandleSpinBoxChange);
@@ -320 +318 @@
 
     /* Init visible maximum VRAM: */
-    m_iMaxVRAMVisible = m_cGuestScreenCount * 32;
+    int iMaxVRAMVisible = m_cGuestScreenCount * 32;
 
     /* Get monitors count and recommended VRAM: */
@@ -326 +324 @@
 
     /* Adjust visible maximum VRAM to be no less than 128MB (if possible): */
-    if (m_iMaxVRAMVisible < 128 && m_iMaxVRAM >= 128)
-        m_iMaxVRAMVisible = 128;
+    if (iMaxVRAMVisible < 128 && m_iMaxVRAM >= 128)
+        iMaxVRAMVisible = 128;
 
 #ifdef VBOX_WITH_3D_ACCELERATION
@@ -335 +333 @@
         iNeedMBytes = qMax(iNeedMBytes, 128);
         /* Adjust visible maximum VRAM to be no less than 256MB (if possible): */
-        if (m_iMaxVRAMVisible < 256 && m_iMaxVRAM >= 256)
-            m_iMaxVRAMVisible = 256;
+        if (iMaxVRAMVisible < 256 && m_iMaxVRAM >= 256)
+            iMaxVRAMVisible = 256;
     }
 #endif /* VBOX_WITH_3D_ACCELERATION */
 
     /* Adjust visible maximum VRAM to be no less than initial VRAM: */
-    m_iMaxVRAMVisible = qMax(m_iMaxVRAMVisible, m_iValue);
+    iMaxVRAMVisible = qMax(iMaxVRAMVisible, m_iValue);
     /* Adjust visible maximum VRAM to be no less than recommended VRAM: */
-    m_iMaxVRAMVisible = qMax(m_iMaxVRAMVisible, iNeedMBytes);
+    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: */
-    m_iMaxVRAMVisible = qMin(m_iMaxVRAMVisible, m_iMaxVRAM);
+    iMaxVRAMVisible = qMin(iMaxVRAMVisible, m_iMaxVRAM);
 
     if (m_pSpinBox)
-        m_pSpinBox->setMaximum(m_iMaxVRAMVisible);
+        m_pSpinBox->setMaximum(iMaxVRAMVisible);
     if (m_pSlider)
     {
-        m_pSlider->setMaximum(m_iMaxVRAMVisible);
-        m_pSlider->setPageStep(calculatePageStep(m_iMaxVRAMVisible));
-        m_pSlider->setWarningHint(1, qMin(iNeedMBytes, m_iMaxVRAMVisible));
-        m_pSlider->setOptimalHint(qMin(iNeedMBytes, m_iMaxVRAMVisible), m_iMaxVRAMVisible);
+        m_pSlider->setMaximum(iMaxVRAMVisible);
+        m_pSlider->setPageStep(calculatePageStep(iMaxVRAMVisible));
+        m_pSlider->setWarningHint(1, qMin(iNeedMBytes, iMaxVRAMVisible));
+        m_pSlider->setOptimalHint(qMin(iNeedMBytes, iMaxVRAMVisible), iMaxVRAMVisible);
     }
     if (m_pLabelMemoryMax)
-        m_pLabelMemoryMax->setText(tr("%1 MB").arg(m_iMaxVRAMVisible));
+        m_pLabelMemoryMax->setText(tr("%1 MB").arg(iMaxVRAMVisible));
 }
 

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

@@ -130 +130 @@
         /** Holds the maximum upper limit of VRAM (MiB). */
         int  m_iMaxVRAM;
-        /** Holds the upper limit of VRAM (MiB) for this dialog.
-          * @note This value is lower than m_iMaxVRAM to save
-          *       careless users from setting useless big values. */
-        int  m_iMaxVRAMVisible;
     /** @} */