GUI: QcRangeSlider: fix stretch behaviour (supercollider#5595)

* GUI: QcRangeSlider: fix stretch behaviour Fixes issue supercollider#3696. The proposed change makes it possible to adjust the height / width of a RangeSlider by using stretch factors. The behaviour of RangeSlider will then match the behaviour of Slider. * Refactoring QcRangeSlider::setOrientation Preventing the undefined behaviour of static_cast * Format with clang-format * QcRangeSlider: fix build errors * RangeSlider: setOrientation call without cast
dyfer · Nov 28, 2021 · 1ad0dcb · 1ad0dcb
1 parent e5686af
commit 1ad0dcb
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/QtCollider/widgets/QcRangeSlider.cpp b/QtCollider/widgets/QcRangeSlider.cpp
@@ -38,13 +38,13 @@ QcRangeSlider::QcRangeSlider(): QtCollider::Style::Client(this), _lo(0.0), _hi(1
     setAttribute(Qt::WA_AcceptTouchEvents);
 }
 
-void QcRangeSlider::setOrientation(Qt::Orientation o) {
-    _ort = o;
+void QcRangeSlider::setOrientation(int orientation) {
+    _ort = asOrientationWithDefault(orientation, Qt::Vertical);
 
     if (_ort == Qt::Horizontal) {
-        setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+        setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
     } else {
-        setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding);
+        setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding);
     }
 
     updateGeometry();
@@ -389,3 +389,10 @@ void QcRangeSlider::paintEvent(QPaintEvent* e) {
             p.drawRect(valRect.adjusted(2, 1, -2, -1));
     }
 }
+
+Qt::Orientation QcRangeSlider::asOrientationWithDefault(int orientationValue, Qt::Orientation defaultOrientation) {
+    if (orientationValue == Qt::Horizontal || orientationValue == Qt::Vertical)
+        return static_cast<Qt::Orientation>(orientationValue);
+
+    return defaultOrientation;
+}
diff --git a/QtCollider/widgets/QcRangeSlider.h b/QtCollider/widgets/QcRangeSlider.h
@@ -45,7 +45,7 @@ class QcRangeSlider : public QWidget, QcHelper, QcAbstractStepValue, QtCollider:
 
     QcRangeSlider();
     Qt::Orientation orientation() const { return _ort; }
-    void setOrientation(Qt::Orientation o);
+    void setOrientation(int);
     double loValue() const { return _lo; }
     void setLoValue(double);
     double hiValue() const { return _hi; }
@@ -82,6 +82,7 @@ public Q_SLOTS:
     void mouseReleaseEvent(QMouseEvent*);
     void keyPressEvent(QKeyEvent*);
     void paintEvent(QPaintEvent*);
+    Qt::Orientation asOrientationWithDefault(int, Qt::Orientation);
 
     Qt::Orientation _ort;
     double _lo;