Changeset 67507 in vbox for trunk/src

Timestamp:

Jun 20, 2017 1:39:18 PM (8 years ago)

Author:

vboxsync

Message:

FE/Qt: Selector UI: New VD wizard: Make sure native slider values are 512-byte aligned as well, single-step property is not enough since Qt5.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageBasic3.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageBasic3.cpp

@@ -224 +224 @@
 int UIWizardNewVDPage3::sizeMBToSlider(qulonglong uValue, int iSliderScale)
 {
+    /* Make sure *any* slider value is multiple of 512: */
+    uValue /= 512;
+
+    /* Calculate result: */
     int iPower = log2i(uValue);
     qulonglong uTickMB = qulonglong (1) << iPower;
     qulonglong uTickMBNext = qulonglong (1) << (iPower + 1);
     int iStep = (uValue - uTickMB) * iSliderScale / (uTickMBNext - uTickMB);
-    return iPower * iSliderScale + iStep;
+    int iResult = iPower * iSliderScale + iStep;
+
+    /* Return result: */
+    return iResult;
 }
 
@@ -234 +241 @@
 qulonglong UIWizardNewVDPage3::sliderToSizeMB(int uValue, int iSliderScale)
 {
+    /* Calculate result: */
     int iPower = uValue / iSliderScale;
     int iStep = uValue % iSliderScale;
     qulonglong uTickMB = qulonglong (1) << iPower;
     qulonglong uTickMBNext = qulonglong (1) << (iPower + 1);
-    return uTickMB + (uTickMBNext - uTickMB) * iStep / iSliderScale;
+    qulonglong uResult = uTickMB + (uTickMBNext - uTickMB) * iStep / iSliderScale;
+
+    /* Make sure *any* slider value is multiple of 512: */
+    uResult *= 512;
+
+    /* Return result: */
+    return uResult;
 }