From d8e0a313750b01dc5d05b14ba17e98989d7fbb50 Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Fri, 17 Apr 2020 01:17:14 +1000 Subject: [PATCH] color: when converting to a QColor for UI, clamp to 0.0-1.0 --- app/render/color.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/app/render/color.cpp b/app/render/color.cpp index 736de812e..14f7e62e1 100644 --- a/app/render/color.cpp +++ b/app/render/color.cpp @@ -20,6 +20,8 @@ #include "color.h" +#include "common/clamp.h" + OLIVE_NAMESPACE_ENTER Color Color::fromHsv(const float &h, const float &s, const float &v) @@ -196,10 +198,11 @@ QColor Color::toQColor() const { QColor c; - c.setRedF(red()); - c.setGreenF(green()); - c.setBlueF(blue()); - c.setAlphaF(alpha()); + // QColor only supports values from 0.0 to 1.0 and are only used for UI representations + c.setRedF(clamp(red(), 0.0f, 1.0f)); + c.setGreenF(clamp(green(), 0.0f, 1.0f)); + c.setBlueF(clamp(blue(), 0.0f, 1.0f)); + c.setAlphaF(clamp(alpha(), 0.0f, 1.0f)); return c; }