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

Timestamp:

Jun 11, 2018 11:24:57 AM (7 years ago)

Author:

vboxsync

Message:

FE/Qt Make sure ram slider and ram spin box has same minimum and maximum in new vm wizards

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• widgets/UIGuestRAMSlider.cpp (modified) (1 diff)
• wizards/newvm/UIWizardNewVMPageBasic2.cpp (modified) (2 diffs)
• wizards/newvm/UIWizardNewVMPageExpert.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIGuestRAMSlider.cpp

@@ -158 +158 @@
     setTickInterval(pageStep());
     /* Setup the scale so that ticks are at page step boundaries */
-    setMinimum((m_uMinRAM / pageStep()) * pageStep());
+    if (m_uMinRAM >= static_cast<uint>(pageStep()))
+        setMinimum((m_uMinRAM / pageStep()) * pageStep());
+    else
+        setMinimum(m_uMinRAM);
+
     setMaximum(m_uMaxRAM);
     setSnappingEnabled(true);

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic2.cpp

@@ -73 +73 @@
             m_pRamEditor = new QSpinBox(this);
             {
-                m_pRamEditor->setMinimum(m_pRamSlider->minRAM());
-                m_pRamEditor->setMaximum(m_pRamSlider->maxRAM());
+                m_pRamEditor->setMinimum(m_pRamSlider->minimum());
+                m_pRamEditor->setMaximum(m_pRamSlider->maximum());
                 vboxGlobal().setMinimumWidthAccordingSymbolCount(m_pRamEditor, 5);
             }
@@ -166 +166 @@
            m_pRamSlider->value() <= (int)m_pRamSlider->maxRAM();
 }
-

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.cpp

@@ -71 +71 @@
                 m_pRamEditor = new QSpinBox(m_pMemoryCnt);
                 {
-                    m_pRamEditor->setMinimum(m_pRamSlider->minRAM());
-                    m_pRamEditor->setMaximum(m_pRamSlider->maxRAM());
+                    m_pRamEditor->setMinimum(m_pRamSlider->minimum());
+                    m_pRamEditor->setMaximum(m_pRamSlider->maximum());
                     vboxGlobal().setMinimumWidthAccordingSymbolCount(m_pRamEditor, 5);
                 }