diff --git a/app/node/block/block.cpp b/app/node/block/block.cpp index 4ce6ec91b..3d1194d80 100644 --- a/app/node/block/block.cpp +++ b/app/node/block/block.cpp @@ -42,6 +42,7 @@ Block::Block() : out_transition_(nullptr) { AddInput(kLengthInput, NodeValue::kRational, InputFlags(kInputFlagNotConnectable | kInputFlagNotKeyframable)); + SetInputProperty(kLengthInput, "min", QVariant::fromValue(rational(0, 1))); IgnoreInvalidationsFrom(kLengthInput); IgnoreHashingFrom(kLengthInput); diff --git a/app/widget/slider/rationalslider.cpp b/app/widget/slider/rationalslider.cpp index fbe6f9ba4..87073187d 100644 --- a/app/widget/slider/rationalslider.cpp +++ b/app/widget/slider/rationalslider.cpp @@ -190,8 +190,6 @@ void RationalSlider::ConvertValue(QVariant v) void RationalSlider::changeDisplayType() { if (!LockDisplayType()) { - // Loop through the display types - //SetDisplayType(static_cast(((int)(display_type_) + 1) % 4)); Menu m(this); MenuShared::instance()->AddItemsForTimeRulerMenu(&m, timebase_); MenuShared::instance()->AboutToShowTimeRulerActions(); diff --git a/app/widget/slider/sliderbase.cpp b/app/widget/slider/sliderbase.cpp index be204b546..713ae15f3 100644 --- a/app/widget/slider/sliderbase.cpp +++ b/app/widget/slider/sliderbase.cpp @@ -335,21 +335,17 @@ void SliderBase::LadderDragged(int value, double multiplier) d_v = rational::fromDouble(drag_val); temp_dragged_value_.setValue(d_v); - QVariant clamped = ClampValue(temp_dragged_value_); - if (clamped.value() != temp_dragged_value_.value()) { - temp_dragged_value_ = clamped; - dragged_diff_ = (temp_dragged_value_.value() - value_.value()).toDouble(); - } + clamped_temp_dragged_value_ = ClampValue(temp_dragged_value_); UpdateLabel(temp_dragged_value_); - drag_ladder_->SetValue(ValueToString(temp_dragged_value_)); + drag_ladder_->SetValue(ValueToString(clamped_temp_dragged_value_)); if (!Config::Current()[QStringLiteral("UseSliderLadders")].toBool()) { RepositionLadder(); } - emit ValueChanged(temp_dragged_value_); + emit ValueChanged(clamped_temp_dragged_value_); break; } }