Changeset 23025 in vbox for trunk/src/VBox/Frontends

Timestamp:

Sep 15, 2009 9:38:15 AM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4: fix the RAMSlider for many host RAM

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• QIAdvancedSlider.cpp (modified) (3 diffs)
• VBoxGuestRAMSlider.cpp (modified) (1 diff)

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

@@ -79 +79 @@
         }
 #endif /* Q_WS_MAC */
-        if (mMinOpt != -1 &&
-            mMaxOpt != -1)
+        if ((mMinOpt != -1 &&
+             mMaxOpt != -1) &&
+            mMinOpt != mMaxOpt)
         {
             int posMinOpt = QStyle::sliderPositionFromValue (opt.minimum, opt.maximum, mMinOpt, available);
@@ -86 +87 @@
             p.fillRect (ticks.x() + posMinOpt, ticks.y(), posMaxOpt - posMinOpt + 1, ticks.height(), mOptColor);
         }
-        if (mMinWrn != -1 &&
-            mMaxWrn != -1)
+        if ((mMinWrn != -1 &&
+             mMaxWrn != -1) &&
+            mMinWrn != mMaxWrn)
         {
             int posMinWrn = QStyle::sliderPositionFromValue (opt.minimum, opt.maximum, mMinWrn, available);
@@ -93 +95 @@
             p.fillRect (ticks.x() + posMinWrn, ticks.y(), posMaxWrn - posMinWrn + 1, ticks.height(), mWrnColor);
         }
-        if (mMinErr != -1 &&
-            mMaxErr != -1)
+        if ((mMinErr != -1 &&
+             mMaxErr != -1) &&
+            mMinErr != mMaxErr)
         {
             int posMinErr = QStyle::sliderPositionFromValue (opt.minimum, opt.maximum, mMinErr, available);

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

@@ -142 +142 @@
         mMaxRAMOpt = (uint)(0.90 * fullSize);
     }
+    /* Now check the calculated maximums are out of the range for the guest
+     * RAM. If so change it accordingly. */
+    mMaxRAMAlw  = RT_MIN (mMaxRAMAlw, mMaxRAM);
+    mMaxRAMOpt  = RT_MIN (mMaxRAMOpt, mMaxRAM);
 
     setPageStep (calcPageStep (mMaxRAM));