No wheelevent on spinboxes

ossia · Sep 16, 2015 · d68d327 · d68d327
1 parent e796ca9
commit d68d327
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 11 deletions.
diff --git a/base/lib/iscore/widgets/SpinBoxes.hpp b/base/lib/iscore/widgets/SpinBoxes.hpp
@@ -1,6 +1,8 @@
 #pragma once
 #include <QSpinBox>
 #include <QDoubleSpinBox>
+#include <QTimeEdit>
+#include <QWheelEvent>
 #include <type_traits>
 
 namespace iscore
@@ -34,6 +36,10 @@ class MaxRangeSpinBox : public SpinBox::spinbox_type
             this->setMinimum(std::numeric_limits<typename SpinBox::value_type>::lowest());
             this->setMaximum(std::numeric_limits<typename SpinBox::value_type>::max());
         }
+        void wheelEvent(QWheelEvent* event) override
+        {
+            event->ignore();
+        }
 };
 
 /**
@@ -47,4 +53,20 @@ class SpinBox : public MaxRangeSpinBox<TemplatedSpinBox<T>>
     public:
         using MaxRangeSpinBox<TemplatedSpinBox<T>>::MaxRangeSpinBox;
 };
+
+
+class TimeSpinBox : public QTimeEdit
+{
+    public:
+        TimeSpinBox(QWidget* parent = 0):
+            QTimeEdit(parent)
+        {
+
+        }
+        void wheelEvent(QWheelEvent* event) override
+        {
+            event->ignore();
+        }
+};
+
 }
diff --git a/...gins/iscore-plugin-scenario/source/Inspector/Constraint/Widgets/DurationSectionWidget.cpp b/...gins/iscore-plugin-scenario/source/Inspector/Constraint/Widgets/DurationSectionWidget.cpp
@@ -22,12 +22,13 @@
 #include "Control/ScenarioControl.hpp"
 
 #include <QCheckBox>
-#include <QSpinBox>
 #include <QToolButton>
 #include <QLabel>
 #include <QFormLayout>
 #include <QTimeEdit>
+
 using namespace iscore;
+
 DurationSectionWidget::DurationSectionWidget(ConstraintInspectorWidget* parent):
     InspectorSectionWidget {"Durations", parent},
     m_model {parent->model()},
@@ -41,9 +42,9 @@ DurationSectionWidget::DurationSectionWidget(ConstraintInspectorWidget* parent):
     widg->setLayout(m_grid);
 
     // SPINBOXES
-    m_minSpin = new QTimeEdit{};
-    m_maxSpin = new QTimeEdit{};
-    m_valueSpin = new QTimeEdit{};
+    m_minSpin = new TimeSpinBox{this};
+    m_maxSpin = new TimeSpinBox{this};
+    m_valueSpin = new TimeSpinBox{this};
 
     m_valueSpin->setDisplayFormat(QString("mm.ss.zzz"));
     m_minSpin->setDisplayFormat(QString("mm.ss.zzz"));
@@ -97,11 +98,11 @@ DurationSectionWidget::DurationSectionWidget(ConstraintInspectorWidget* parent):
 
     //on_modelRigidityChanged(m_model.duration.isRigid());
 
-    connect(m_valueSpin,    &QTimeEdit::editingFinished,
+    connect(m_valueSpin,    &TimeSpinBox::editingFinished,
             this,   &DurationSectionWidget::on_durationsChanged);
-    connect(m_minSpin,  &QTimeEdit::editingFinished,
+    connect(m_minSpin,  &TimeSpinBox::editingFinished,
             this,   &DurationSectionWidget::on_durationsChanged);
-    connect(m_maxSpin,  &QTimeEdit::editingFinished,
+    connect(m_maxSpin,  &TimeSpinBox::editingFinished,
             this,   &DurationSectionWidget::on_durationsChanged);
 
 

diff --git a/...gins/iscore-plugin-scenario/source/Inspector/Constraint/Widgets/DurationSectionWidget.hpp b/...gins/iscore-plugin-scenario/source/Inspector/Constraint/Widgets/DurationSectionWidget.hpp
@@ -2,11 +2,11 @@
 #include <Inspector/InspectorSectionWidget.hpp>
 #include <ProcessInterface/TimeValue.hpp>
 #include <iscore/command/Dispatchers/OngoingCommandDispatcher.hpp>
+#include "iscore/widgets/SpinBoxes.hpp"
 
 class QLabel;
 class ConstraintModel;
 class ConstraintInspectorWidget;
-class QTimeEdit;
 class QCheckBox;
 class QGridLayout;
 class QHBoxLayout;
@@ -44,9 +44,9 @@ class DurationSectionWidget : public InspectorSectionWidget
         QLabel* m_maxLab{};
         QLabel* m_minLab{};
 
-        QTimeEdit* m_minSpin{};
-        QTimeEdit* m_valueSpin{};
-        QTimeEdit* m_maxSpin{};
+        iscore::TimeSpinBox* m_minSpin{};
+        iscore::TimeSpinBox* m_valueSpin{};
+        iscore::TimeSpinBox* m_maxSpin{};
 
         QCheckBox* m_minNonNullBox{};
         QCheckBox* m_maxFiniteBox{};