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

Timestamp:

Jun 11, 2013 3:26:17 PM (12 years ago)

Author:

vboxsync

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

86345

Message:

FE/Qt: Advanced slider: Make sure tickmark area is properly (manually) calculated; Forbid support for tickmark repositioning (it was not used anyway).

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extensions/QIAdvancedSlider.cpp (modified) (3 diffs)
• extensions/QIAdvancedSlider.h (modified) (1 diff)
• wizards/newvm/UIWizardNewVMPageBasic2.cpp (modified) (1 diff)
• wizards/newvm/UIWizardNewVMPageExpert.cpp (modified) (1 diff)

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

@@ -44 +44 @@
       , m_minErr(-1)
       , m_maxErr(-1)
-    {}
+    {
+        /* Make sure ticks *always* positioned below: */
+        setTickPosition(QSlider::TicksBelow);
+    }
 
     int positionForValue(int val) const
@@ -66 +69 @@
         QSize s = size();
 
+        /* We want to acquire SC_SliderTickmarks sub-control rectangle
+         * and fill it with necessary background colors: */
+#ifdef Q_WS_MAC
+        /* Under MacOS X SC_SliderTickmarks is not fully reliable
+         * source of the information we need, providing us with incorrect width.
+         * So we have to calculate tickmarks rectangle ourself: */
         QRect ticks = style()->subControlRect(QStyle::CC_Slider, &opt, QStyle::SC_SliderTickmarks, this);
-#ifdef Q_WS_MAC
         ticks.setRect((s.width() - available) / 2, s.height() - ticks.y(), available, ticks.height());
 #else /* Q_WS_MAC */
-        if (ticks.isNull() || ticks.isEmpty())
-        {
-            ticks = style()->subControlRect(QStyle::CC_Slider, &opt, QStyle::SC_SliderHandle, this) | style()->subControlRect(QStyle::CC_Slider, &opt, QStyle::SC_SliderGroove, this);
-            ticks.setRect((s.width() - available) / 2, ticks.bottom() + 1, available, s.height() - ticks.bottom() - 1);
-        }
+        /* Under Windows SC_SliderTickmarks is fully unreliable
+         * source of the information we need, providing us with empty rectangle.
+         * Under X11 SC_SliderTickmarks is not fully reliable
+         * source of the information we need, providing us with different rectangles
+         * (correct or incorrect) under different look&feel styles.
+         * So we have to calculate tickmarks rectangle ourself: */
+        QRect ticks = style()->subControlRect(QStyle::CC_Slider, &opt, QStyle::SC_SliderHandle, this) |
+                      style()->subControlRect(QStyle::CC_Slider, &opt, QStyle::SC_SliderGroove, this);
+        ticks.setRect((s.width() - available) / 2, ticks.bottom() + 1, available, s.height() - ticks.bottom() - 1);
 #endif /* Q_WS_MAC */
+
         if ((m_minOpt != -1 &&
              m_maxOpt != -1) &&
@@ -189 +202 @@
 }
 
-void QIAdvancedSlider::setTickPosition(QSlider::TickPosition fPos)
-{
-    m_pSlider->setTickPosition(fPos);
-}
-
-QSlider::TickPosition QIAdvancedSlider::tickPosition() const
-{
-    return m_pSlider->tickPosition();
-}
-
 Qt::Orientation QIAdvancedSlider::orientation() const
 {

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

@@ -53 +53 @@
     int tickInterval() const;
 
-    void setTickPosition(QSlider::TickPosition fPos);
-    QSlider::TickPosition tickPosition() const;
-
     Qt::Orientation orientation() const;
 

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

@@ -65 +65 @@
                 m_pRamSlider->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
                 m_pRamSlider->setOrientation(Qt::Horizontal);
-                m_pRamSlider->setTickPosition(QSlider::TicksBelow);
             }
             m_pRamEditor = new QILineEdit(this);

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

@@ -64 +64 @@
                     m_pRamSlider->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
                     m_pRamSlider->setOrientation(Qt::Horizontal);
-                    m_pRamSlider->setTickPosition(QSlider::TicksBelow);
                     m_pRamSlider->setValue(m_pNameAndSystemEditor->type().GetRecommendedRAM());
                 }