diff options
Diffstat (limited to 'fpdfsdk/pwl/cpwl_scroll_bar.cpp')
-rw-r--r-- | fpdfsdk/pwl/cpwl_scroll_bar.cpp | 28 |
1 files changed, 8 insertions, 20 deletions
diff --git a/fpdfsdk/pwl/cpwl_scroll_bar.cpp b/fpdfsdk/pwl/cpwl_scroll_bar.cpp index 472e6afc24..ced049a175 100644 --- a/fpdfsdk/pwl/cpwl_scroll_bar.cpp +++ b/fpdfsdk/pwl/cpwl_scroll_bar.cpp @@ -8,6 +8,7 @@ #include <algorithm> #include <sstream> +#include <utility> #include <vector> #include "core/fxge/cfx_pathdata.h" @@ -24,27 +25,14 @@ constexpr float kScrollBarTriangleHalfLength = 2.0f; #define PWL_DEFAULT_HEAVYGRAYCOLOR CFX_Color(CFX_Color::kGray, 0.50) -PWL_FLOATRANGE::PWL_FLOATRANGE() { - Default(); -} - -PWL_FLOATRANGE::PWL_FLOATRANGE(float min, float max) { - Set(min, max); +void PWL_FLOATRANGE::Reset() { + fMin = 0.0f; + fMax = 0.0f; } -void PWL_FLOATRANGE::Default() { - fMin = 0; - fMax = 0; -} - -void PWL_FLOATRANGE::Set(float min, float max) { - if (min > max) { - fMin = max; - fMax = min; - } else { - fMin = min; - fMax = max; - } +void PWL_FLOATRANGE::Set(float f1, float f2) { + fMin = std::min(f1, f2); + fMax = std::max(f1, f2); } bool PWL_FLOATRANGE::In(float x) const { @@ -61,7 +49,7 @@ PWL_SCROLL_PRIVATEDATA::PWL_SCROLL_PRIVATEDATA() { } void PWL_SCROLL_PRIVATEDATA::Default() { - ScrollRange.Default(); + ScrollRange.Reset(); fScrollPos = ScrollRange.fMin; fClientWidth = 0; fBigStep = 10; |