qml: allow to customize blockclockdial's pen width

Author: jarolrod

src/qml/components/blockclockdial.cpp

@@ -10,10 +10,12 @@
 #include <QConicalGradient>
 #include <QPen>
 #include <QtMath>
+#include <QtGlobal>
 
 BlockClockDial::BlockClockDial(QQuickItem *parent)
 : QQuickPaintedItem(parent)
 , m_time_ratio_list{0.0}
+, m_pen_width{4}
 , m_background_color{QColor("#2D2D2D")}
 , m_confirmation_colors{QList<QColor>{}}
 , m_time_tick_color{QColor("#000000")}
@@ -132,6 +134,12 @@ void BlockClockDial::setPaused(bool paused)
     }
 }
 
+void BlockClockDial::setPenWidth(qreal width)
+{
+    m_pen_width = width;
+    update();
+}
+
 void BlockClockDial::setBackgroundColor(QColor color)
 {
     m_background_color = color;
@@ -183,7 +191,7 @@ void BlockClockDial::paintBlocks(QPainter * painter)
     }
 
     QPen pen(m_confirmation_colors[5]);
-    pen.setWidth(4);
+    pen.setWidthF(m_pen_width);
     pen.setCapStyle(Qt::FlatCap);
     const QRectF bounds = getBoundsForPen(pen);
     painter->setPen(pen);
@@ -196,7 +204,7 @@ void BlockClockDial::paintBlocks(QPainter * painter)
     for (int i = 1; i < numberOfBlocks; i++) {
         if (numberOfBlocks - i <= 6) {
             QPen pen(m_confirmation_colors[numberOfBlocks - i - 1]);
-            pen.setWidth(4);
+            pen.setWidthF(m_pen_width);
             pen.setCapStyle(Qt::FlatCap);
             painter->setPen(pen);
         }
@@ -227,7 +235,7 @@ void BlockClockDial::paintBlocks(QPainter * painter)
 void BlockClockDial::paintProgress(QPainter * painter)
 {
     QPen pen(m_confirmation_colors[5]);
-    pen.setWidthF(4);
+    pen.setWidthF(m_pen_width);
     pen.setCapStyle(Qt::RoundCap);
     const QRectF bounds = getBoundsForPen(pen);
     painter->setPen(pen);
@@ -250,7 +258,7 @@ void BlockClockDial::paintProgress(QPainter * painter)
 void BlockClockDial::paintConnectingAnimation(QPainter * painter)
 {
     QPen pen;
-    pen.setWidthF(4);
+    pen.setWidthF(m_pen_width);
     setupConnectingGradient(pen);
     pen.setBrush(QBrush(m_connecting_gradient));
     pen.setCapStyle(Qt::RoundCap);
@@ -267,7 +275,7 @@ void BlockClockDial::paintConnectingAnimation(QPainter * painter)
 void BlockClockDial::paintBackground(QPainter * painter)
 {
     QPen pen(m_background_color);
-    pen.setWidthF(4);
+    pen.setWidthF(m_pen_width);
     const QRectF bounds = getBoundsForPen(pen);
     painter->setPen(pen);
 
@@ -283,12 +291,12 @@ double BlockClockDial::degreesPerPixel()
 void BlockClockDial::paintTimeTicks(QPainter * painter)
 {
     QPen pen(m_time_tick_color);
-    pen.setWidthF(4);
+    pen.setWidthF(m_pen_width);
     // Calculate bound based on width of default pen
     const QRectF bounds = getBoundsForPen(pen);
 
     QPen time_tick_pen = QPen(m_time_tick_color);
-    time_tick_pen.setWidth(2);
+    time_tick_pen.setWidthF(m_pen_width / 2);
     time_tick_pen.setCapStyle(Qt::RoundCap);
     painter->setPen(time_tick_pen);
     for (double angle = 0; angle < 360; angle += 30) {

src/qml/components/blockclockdial.h

@@ -9,6 +9,7 @@
 #include <QConicalGradient>
 #include <QPainter>
 #include <QTimer>
+#include <QtGlobal>
 
 class BlockClockDial : public QQuickPaintedItem
 {
@@ -18,6 +19,7 @@ class BlockClockDial : public QQuickPaintedItem
     Q_PROPERTY(bool connected READ connected WRITE setConnected)
     Q_PROPERTY(bool synced READ synced WRITE setSynced)
     Q_PROPERTY(bool paused READ paused WRITE setPaused)
+    Q_PROPERTY(qreal penWidth READ penWidth WRITE setPenWidth)
     Q_PROPERTY(QColor backgroundColor READ backgroundColor WRITE setBackgroundColor)
     Q_PROPERTY(QList<QColor> confirmationColors READ confirmationColors WRITE setConfirmationColors )
     Q_PROPERTY(QColor timeTickColor READ timeTickColor WRITE setTimeTickColor)
@@ -31,6 +33,7 @@ class BlockClockDial : public QQuickPaintedItem
     bool connected() const { return m_is_connected; };
     bool synced() const { return m_is_synced; };
     bool paused() const { return m_is_paused; };
+    qreal penWidth() const { return m_pen_width; };
     QColor backgroundColor() const { return m_background_color; };
     QList<QColor> confirmationColors() const { return m_confirmation_colors; };
     QColor timeTickColor() const { return m_time_tick_color; };
@@ -41,6 +44,7 @@ public Q_SLOTS:
     void setConnected(bool connected);
     void setSynced(bool synced);
     void setPaused(bool paused);
+    void setPenWidth(qreal width);
     void setBackgroundColor(QColor color);
     void setConfirmationColors(QList<QColor> colorList);
     void setTimeTickColor(QColor color);
@@ -63,6 +67,7 @@ public Q_SLOTS:
     bool m_is_connected;
     bool m_is_synced;
     bool m_is_paused;
+    qreal m_pen_width;
     QColor m_background_color;
     QConicalGradient m_connecting_gradient;
     qreal m_connecting_start_angle = 90;