From 11b3f55b9433a96a0ce190d5ebafd77b1d46cbae Mon Sep 17 00:00:00 2001 From: silas Date: Sat, 27 Feb 2021 10:26:45 -0600 Subject: [PATCH] Fix Color Wheel background --- dependencies/ColorWheel/ColorWheel.cpp | 5 +++++ dependencies/ColorWheel/ColorWheel.h | 3 +++ 2 files changed, 8 insertions(+) diff --git a/dependencies/ColorWheel/ColorWheel.cpp b/dependencies/ColorWheel/ColorWheel.cpp index 4e9f5015..5c696acc 100644 --- a/dependencies/ColorWheel/ColorWheel.cpp +++ b/dependencies/ColorWheel/ColorWheel.cpp @@ -343,6 +343,8 @@ void ColorWheel::drawWheelImage(const QSize &newSize) QRegion subRe( r/2, r/2, r-tmp, r-tmp, QRegion::Ellipse ); subRe.translate( x_offset - (r-tmp)/2, y_offset - (r-tmp)/2); wheelRegion -= subRe; + + CleanWheel = QPixmap().fromImage(wheelImage); } void ColorWheel::drawSquareImage(const int &hue) @@ -399,6 +401,7 @@ void ColorWheel::drawSquareImage(const int &hue) | Calculate square region | \*-----------------------------------------------------*/ squareRegion = QRegion(x_offset + m, y_offset + m, SquareWidth, SquareWidth); + CleanSquare = squareImage; } void ColorWheel::drawIndicator(const int &hue) @@ -461,6 +464,8 @@ void ColorWheel::drawPicker(const QColor &color) void ColorWheel::composeWheel() { + wheel = CleanWheel; + squareImage = CleanSquare; QPainter composePainter(&wheel); composePainter.drawImage(0, 0, wheelImage); composePainter.drawImage(squareRegion.boundingRect().topLeft(), squareImage); diff --git a/dependencies/ColorWheel/ColorWheel.h b/dependencies/ColorWheel/ColorWheel.h index 9726400c..cdb94721 100644 --- a/dependencies/ColorWheel/ColorWheel.h +++ b/dependencies/ColorWheel/ColorWheel.h @@ -42,6 +42,9 @@ private: int x_offset; int y_offset; + QPixmap CleanWheel; + QImage CleanSquare; + QColor posColor(const QPoint &point); void drawWheelImage(const QSize &newSize); void drawIndicator(const int &hue);