mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2024-07-08 05:59:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't put the color indicator in normal map outside the wheel (fix #3595)

Browse Source
This commit is contained in:
David Capello 2022-11-17 17:50:17 -03:00
parent d8c1b19c80
commit 01967be53c
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/app/ui/color_wheel.cpp
View File

@ -344,9 +344,14 @@ void ColorWheel::onPaintMainArea(ui::Graphics* g, const gfx::Rect& rc)
double x, y;
double approximationThreshold = (246.0 / 255.0) * 2.0 - 1.0;
if (normalizedBlue > approximationThreshold) { // If blue is too high, we use red and green only as approximation
x = normalizedRed * m_wheelRadius;
y = -normalizedGreen * m_wheelRadius;
if (normalizedBlue > approximationThreshold) {
// If blue is too high, we use red and green only as approximation
double angle = std::atan2(normalizedGreen, normalizedRed);
double dist = std::sqrt(normalizedRed*normalizedRed + normalizedGreen*normalizedGreen);
dist = std::clamp(dist, 0.0, 1.0);
x = std::cos(angle) * m_wheelRadius * dist;
y = -std::sin(angle) * m_wheelRadius * dist;
}
else {
double normalizedDistance = std::cos(std::asin(normalizedBlue));