oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

colorwheel/colorgradient: clamped at 1.0

Browse Source 
Since these are UI/display components, they are clamped at 0.0 - 1.0
This commit is contained in:
itsmattkc
2020-04-22 18:15:29 +10:00
parent 258f83d5d3
commit de783d214a
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/widget/colorwheel/colorgradientwidget.cpp
+4 -2
View File
@@ -76,10 +76,12 @@ void ColorGradientWidget::paintEvent(QPaintEvent *e)
p.setPen(QPen(GetUISelectorColor(), qMax(1, selector_radius / 2)));
p.setBrush(Qt::NoBrush);
float clamped_val = clamp(val_, 0.0f, 1.0f);
if (orientation_ == Qt::Horizontal) {
p.drawRect(qRound(width() * (1.0 - val_)) - selector_radius, 0, selector_radius * 2, height() - 1);
p.drawRect(qRound(width() * (1.0 - clamped_val)) - selector_radius, 0, selector_radius * 2, height() - 1);
} else {
p.drawRect(0, qRound(height() * (1.0 - val_)) - selector_radius, width() - 1, selector_radius * 2);
p.drawRect(0, qRound(height() * (1.0 - clamped_val)) - selector_radius, width() - 1, selector_radius * 2);
}
}
app/widget/colorwheel/colorwheelwidget.cpp
+2 -1
View File
@@ -23,6 +23,7 @@
#include <QPainter>
#include <QtMath>
#include "common/clamp.h"
#include "node/node.h"
OLIVE_NAMESPACE_ENTER
@@ -120,7 +121,7 @@ void ColorWheelWidget::SelectedColorChangedEvent(const Color &c, bool external)
{
if (external) {
force_redraw_ = true;
val_ = c.value();
val_ = clamp(c.value(), 0.0f, 1.0f);
}
}