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

Timestamp:

Aug 5, 2015 1:57:46 PM (10 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

101945

Message:

FE:Qt 7928:Fix for slider color issue.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIAdvancedSlider.cpp (modified) (4 diffs)

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

@@ -95 +95 @@
 #endif /* Q_WS_MAC */
 
+        /* Calculating half of tick-width as it is required to adjust the colors range geometry
+         * for sliders which have tick-interval and single-step equal like CPU and Monitor count sliders.
+         * It is used in below code to draw correct boundaries. */
+        qreal dHalfTickWidth = 0;
+        if (tickInterval() == singleStep())
+            dHalfTickWidth = (qreal)ticks.width() / (maximum() - minimum()) / 2;
+
         if ((m_minOpt != -1 &&
              m_maxOpt != -1) &&
@@ -101 +108 @@
             int posMinOpt = QStyle::sliderPositionFromValue(opt.minimum, opt.maximum, m_minOpt, available);
             int posMaxOpt = QStyle::sliderPositionFromValue(opt.minimum, opt.maximum, m_maxOpt, available);
-            p.fillRect(ticks.x() + posMinOpt, ticks.y(), posMaxOpt - posMinOpt + 1, ticks.height(), m_optColor);
+            p.fillRect(ticks.x() + posMinOpt, ticks.y(), posMaxOpt - posMinOpt + 1 + dHalfTickWidth, ticks.height(), m_optColor);
         }
         if ((m_minWrn != -1 &&
@@ -109 +116 @@
             int posMinWrn = QStyle::sliderPositionFromValue(opt.minimum, opt.maximum, m_minWrn, available);
             int posMaxWrn = QStyle::sliderPositionFromValue(opt.minimum, opt.maximum, m_maxWrn, available);
-            p.fillRect(ticks.x() + posMinWrn, ticks.y(), posMaxWrn - posMinWrn + 1, ticks.height(), m_wrnColor);
+            if (maximum() > m_maxWrn)
+                p.fillRect(ticks.x() + posMinWrn + dHalfTickWidth, ticks.y(), posMaxWrn - posMinWrn + 1, ticks.height(), m_wrnColor);
+            else
+                p.fillRect(ticks.x() + posMinWrn + dHalfTickWidth, ticks.y(), posMaxWrn - posMinWrn + 1 - dHalfTickWidth, ticks.height(), m_wrnColor);
         }
         if ((m_minErr != -1 &&
@@ -117 +127 @@
             int posMinErr = QStyle::sliderPositionFromValue(opt.minimum, opt.maximum, m_minErr, available);
             int posMaxErr = QStyle::sliderPositionFromValue(opt.minimum, opt.maximum, m_maxErr, available);
-            p.fillRect(ticks.x() + posMinErr, ticks.y(), posMaxErr - posMinErr + 1, ticks.height(), m_errColor);
+            p.fillRect(ticks.x() + posMinErr + dHalfTickWidth, ticks.y(), posMaxErr - posMinErr + 1 - dHalfTickWidth, ticks.height(), m_errColor);
         }
         p.end();