[graphics/krita] libs/ui: Remove regression from rebasing
Emmet O'Neill <[email protected]>
| Newsgroups | gmane.comp.kde.cvs |
|---|---|
| Message-ID | <[email protected]> |
Git commit 2e2333ace54c58745cff0127bcc9bec054e78c9c by Emmet O'Neill, on behalf of Dat Le.
Committed on 13/08/2026 at 23:16.
Pushed by emmetoneill into branch 'master'.
Remove regression from rebasing
M +1 -1 libs/ui/forms/wdggeneralsettings.ui
M +1 -10 libs/ui/tool/KisAsyncColorSamplerHelper.cpp
https://invent.kde.org/graphics/krita/-/commit/2e2333ace54c58745cff0127bcc9bec054e78c9c
diff --git a/libs/ui/forms/wdggeneralsettings.ui b/libs/ui/forms/wdggeneralsettings.ui
index 754840408dd..1da5910c1e6 100644
--- a/libs/ui/forms/wdggeneralsettings.ui
+++ b/libs/ui/forms/wdggeneralsettings.ui
@@ -1047,7 +1047,7 @@
</widget>
</item>
<item row="3" column="0">
- <widget class="QLabel" name="label_23">
+ <widget class="QLabel" name="m_lblColorSamplerZoomPreviewScale">
<property name="text">
<string>Zoom Preview Scale:</string>
</property>
diff --git a/libs/ui/tool/KisAsyncColorSamplerHelper.cpp b/libs/ui/tool/KisAsyncColorSamplerHelper.cpp
index c024cdf9f6d..dc4c04c2b26 100644
--- a/libs/ui/tool/KisAsyncColorSamplerHelper.cpp
+++ b/libs/ui/tool/KisAsyncColorSamplerHelper.cpp
@@ -507,15 +507,6 @@ void KisAsyncColorSamplerHelper::paintCircle(QPainter &gc,
if (needsNewCache || (needsDualColor && !qFuzzyCompare(m_d->cacheRotation, canvasRotationAngle))) {
m_d->cacheRotation = canvasRotationAngle;
- QColor backgroundColor = colorWithAlpha(qApp->palette().color(QPalette::Base), OPACITY_OPAQUE_U8 / 2 + 1);
- qreal penWidth = m_d->circlePreviewDiameter > 100 ? (2.0 * dpr) : (1.0 * dpr);
- QPen pen = QPen(backgroundColor, penWidth);
- if (m_d->circlePreviewOutlineEnabled) {
- cachePainter.setPen(pen);
- } else {
- cachePainter.setPen(Qt::NoPen);
- }
-
QRectF outerRect = cacheRect.marginsRemoved(QMarginsF(penWidth, penWidth, penWidth, penWidth));
if (needsDualColor) {
@@ -582,7 +573,7 @@ void KisAsyncColorSamplerHelper::paintCircle(QPainter &gc,
// Or fill with an opaque color to hide normal view when zooming at edge of canvas
cachePainter.setPen(Qt::NoPen);
// If the cached block don't run, no brush is set. So set it
- cachePainter.setBrush(qApp->palette().color(QPalette::ColorRole::Base));
+ cachePainter.setBrush(m_d->backgroundColor);
if (m_d->circleZoomPreviewScale > 1){
cachePainter.setCompositionMode(QPainter::CompositionMode_SourceOver);
}