Theme minor (pivot node)

friction2d · Aug 12, 2024 · c88966a · c88966a
1 parent fd48e2d
commit c88966a
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 24 deletions.
diff --git 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
@@ -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,