From c88966a6b5875d3d8eefc92c464e83c0522dcc8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ole-Andr=C3=A9=20Rodlie?= Date: Mon, 12 Aug 2024 23:15:38 +0200 Subject: [PATCH] Theme minor (pivot node) --- src/core/MovablePoints/boxpathpoint.cpp | 25 ++++++++++++++----------- src/core/MovablePoints/pathpivot.cpp | 25 ++++++++++++------------- 2 files changed, 26 insertions(+), 24 deletions(-) diff --git a/src/core/MovablePoints/boxpathpoint.cpp b/src/core/MovablePoints/boxpathpoint.cpp index 8a7e75130..54cf0ac0d 100644 --- a/src/core/MovablePoints/boxpathpoint.cpp +++ b/src/core/MovablePoints/boxpathpoint.cpp @@ -52,25 +52,28 @@ void BoxPathPoint::finishTransform() { bTrans->finishPivotTransform(); } -void BoxPathPoint::drawSk(SkCanvas * const canvas, const CanvasMode mode, - const float invScale, const bool keyOnCurrent, - const bool ctrlPressed) { +void BoxPathPoint::drawSk(SkCanvas * const canvas, + const CanvasMode mode, + const float invScale, + const bool keyOnCurrent, + const bool ctrlPressed) +{ Q_UNUSED(mode) Q_UNUSED(keyOnCurrent) Q_UNUSED(ctrlPressed) const SkPoint absPos = toSkPoint(getAbsolutePos()); - const SkColor fillCol = isSelected() ? - toSkColor(ThemeSupport::getThemeColorRed(155)) : - toSkColor(ThemeSupport::getThemeColorOrange(155)); - drawOnAbsPosSk(canvas, absPos, invScale, fillCol); - - /*canvas->save(); + drawOnAbsPosSk(canvas, + absPos, + invScale, + toSkColor(ThemeSupport::getThemeColorOrange(155))); + canvas->save(); canvas->translate(absPos.x(), absPos.y()); SkPaint paint; + paint.setAntiAlias(true); paint.setStyle(SkPaint::kStroke_Style); - paint.setColor(SK_ColorBLACK); + paint.setColor(toSkColor(ThemeSupport::getThemeButtonBaseColor())); const float scaledHalfRadius = toSkScalar(getRadius()*0.5)*invScale; canvas->drawLine(-scaledHalfRadius, 0, scaledHalfRadius, 0, paint); canvas->drawLine(0, -scaledHalfRadius, 0, scaledHalfRadius, paint); - canvas->restore();*/ + canvas->restore(); } diff --git a/src/core/MovablePoints/pathpivot.cpp b/src/core/MovablePoints/pathpivot.cpp index 135553975..48c26ec8a 100644 --- a/src/core/MovablePoints/pathpivot.cpp +++ b/src/core/MovablePoints/pathpivot.cpp @@ -40,27 +40,26 @@ void PathPivot::drawSk(SkCanvas * const canvas, const CanvasMode mode, const float invScale, const bool keyOnCurrent, - const bool ctrlPressed) { + const bool ctrlPressed) +{ Q_UNUSED(keyOnCurrent) Q_UNUSED(ctrlPressed) - //const SkPoint absPos = toSkPoint(getAbsolutePos()); - if(isVisible(mode)) { - const SkColor fillCol = isSelected() ? - toSkColor(ThemeSupport::getThemeColorBlue(155)) : - toSkColor(ThemeSupport::getThemeColorGreen(155)); - const SkPoint absPos = toSkPoint(getAbsolutePos()); - drawOnAbsPosSk(canvas, absPos, invScale, fillCol); - } - - /*canvas->save(); + if (!isVisible(mode)) { return; } + const SkPoint absPos = toSkPoint(getAbsolutePos()); + drawOnAbsPosSk(canvas, + absPos, + invScale, + toSkColor(ThemeSupport::getThemeColorGreen(155))); + canvas->save(); canvas->translate(absPos.x(), absPos.y()); SkPaint paint; + paint.setAntiAlias(true); paint.setStyle(SkPaint::kStroke_Style); - paint.setColor(SK_ColorBLACK); + paint.setColor(toSkColor(ThemeSupport::getThemeButtonBaseColor())); const float scaledHalfRadius = toSkScalar(getRadius()*0.5)*invScale; canvas->drawLine(-scaledHalfRadius, 0, scaledHalfRadius, 0, paint); canvas->drawLine(0, -scaledHalfRadius, 0, scaledHalfRadius, paint); - canvas->restore();*/ + canvas->restore(); } void PathPivot::drawTransforming(SkCanvas * const canvas,