revert: use max(minimum, min(bottom, value)) over clamp(..) (#5393)

This commit is contained in:
nerix
2024-05-13 20:00:50 +02:00
committed by GitHub
parent 2ad45bc288
commit fdecb4a39f
2 changed files with 4 additions and 2 deletions
+1 -1
View File
@@ -10,7 +10,7 @@
- Dev: Use Qt's high DPI scaling. (#4868)
- Dev: Add doxygen build target. (#5377)
- Dev: Make printing of strings in tests easier. (#5379)
- Dev: Refactor and document `Scrollbar`. (#5334)
- Dev: Refactor and document `Scrollbar`. (#5334, #5393)
## 2.5.1
+3 -1
View File
@@ -153,7 +153,9 @@ void Scrollbar::setPageSize(qreal value)
void Scrollbar::setDesiredValue(qreal value, bool animated)
{
value = std::clamp(value, this->minimum_, this->getBottom());
// this can't use std::clamp, because minimum_ < getBottom() isn't always
// true, which is a precondition for std::clamp
value = std::max(this->minimum_, std::min(this->getBottom(), value));
if (areClose(this->currentValue_, value))
{
// value has not changed