Просмотр исходного кода

BUG: Fix failing ctkDoubleRangesSlider test in setValues

make sure the new value are inside the bounds.
Julien Finet лет назад: 14
Родитель
Сommit
29beffee0a
1 измененных файлов с 2 добавлено и 2 удалено
  1. 2 2
      Libs/Widgets/ctkDoubleRangeSlider.cpp

+ 2 - 2
Libs/Widgets/ctkDoubleRangeSlider.cpp

@@ -366,8 +366,8 @@ void ctkDoubleRangeSlider::setValues(double newMinVal, double newMaxVal)
   // We can't call setMinimumValue() and setMaximumValue() as they would
   // generate an inconsistent state. when minimumValueChanged() is fired the
   // new max value wouldn't be updated yet.
-  double newMinValue = qMin(newMinVal, newMaxVal);
-  double newMaxValue = qMax(newMinVal, newMaxVal);
+  double newMinValue = qBound(d->Minimum, qMin(newMinVal, newMaxVal), d->Maximum);
+  double newMaxValue = qBound(d->Minimum, qMax(newMinVal, newMaxVal), d->Maximum);
   d->updateMinOffset(newMinValue);
   d->updateMaxOffset(newMaxValue);
   int newMinIntValue = d->toInt(newMinValue);