Simplify cursor paint methods

pencil2d · Jan 9, 2024 · ebe30ee · ebe30ee
1 parent cb53144
commit ebe30ee
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/core_lib/src/canvascursorpainter.cpp b/core_lib/src/canvascursorpainter.cpp
@@ -2,6 +2,14 @@
 
 CanvasCursorPainter::CanvasCursorPainter()
 {
+    setupPen();
+}
+
+void CanvasCursorPainter::setupPen()
+{
+    mCursorPen = Qt::gray;
+    mCursorPen.setWidthF(1);
+    mCursorPen.setCosmetic(true);
 }
 
 void CanvasCursorPainter::paint(QPainter& painter, const QRect& blitRect)
@@ -40,12 +48,8 @@ void CanvasCursorPainter::paintFeatherCursor(QPainter& painter, const QRect& bli
 
     painter.save();
 
-    QPen cursorPen = QPen(Qt::gray);
     painter.setClipRect(blitRect);
-    cursorPen.setWidthF(1);
-    cursorPen.setCosmetic(true);
-
-    painter.setPen(cursorPen);
+    painter.setPen(mCursorPen);
     painter.setCompositionMode(QPainter::RasterOp_SourceXorDestination);
     painter.drawEllipse(featherCircleBounds);
 
@@ -56,12 +60,8 @@ void CanvasCursorPainter::paintWidthCursor(QPainter& painter, const QRect& blitR
 {
     painter.save();
 
-    QPen cursorPen = QPen(Qt::gray);
     painter.setClipRect(blitRect);
-    cursorPen.setWidthF(1);
-    cursorPen.setCosmetic(true);
-
-    painter.setPen(cursorPen);
+    painter.setPen(mCursorPen);
 
     painter.setCompositionMode(QPainter::RasterOp_SourceXorDestination);
 

diff --git a/core_lib/src/canvascursorpainter.h b/core_lib/src/canvascursorpainter.h
@@ -24,6 +24,7 @@ class CanvasCursorPainter
     const QRectF dirtyRect() { return mDirtyRect; }
 private:
 
+    void setupPen();
     void mapToView(QRectF& widthRect, QRectF& featherRect);
 
     /// @brief precision circular cursor: used for drawing a cursor on the canvas.
@@ -33,6 +34,8 @@ class CanvasCursorPainter
     CanvasCursorPainterOptions mOptions;
     QRectF mDirtyRect;
     QTransform mViewTransform;
+
+    QPen mCursorPen;
 };
 
 #endif // CANVASCURSORPAINTER_H