HEY, LOOK MA, I MADE IT! The bullets paginator is done and with progr…

…ess feature. The old progressbar is gonegit stash apply stash@{0}!
NathanPB · Nov 2, 2019 · aed6892 · aed6892
1 parent 18799c2
commit aed6892
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 57 deletions.
diff --git a/plasma5-genial/contents/ui/BulletsDelegate.qml b/plasma5-genial/contents/ui/BulletsDelegate.qml
@@ -1,15 +1,18 @@
 import QtQuick 2.12
 
 Rectangle {
+    id: root
 
     property bool active: false
+    property int interval: 0
+    property int progress: 0
 
     signal clicked()
 
-    width: 10
-    height: 10
+    width: active ? 13 : 10
+    height: width
 
-    color: active ? border.color : "transparent"
+    color: "transparent"
 
     border.width: 2
     border.color: "grey"
@@ -20,4 +23,49 @@ Rectangle {
         anchors.fill: parent
         onClicked: parent.clicked()
     }
+
+    Canvas {
+        id: canvas
+
+        anchors.fill: parent
+        visible: parent.active
+        property var ctx
+        onAvailableChanged: if(available) ctx = getContext("2d")
+
+        onPaint: {
+            if(!ctx) return;
+            ctx.reset();
+
+            let centreX = width / 2;
+            let centreY = height / 2;
+            let paintedAngle =  (progress * Math.PI * 2) / 100
+
+            ctx.beginPath();
+            ctx.fillStyle = "grey";
+            ctx.moveTo(centreX, centreY);
+            ctx.arc(centreX, centreY, centreX, Math.PI + Math.PI / 2, paintedAngle + Math.PI + Math.PI / 2, false);
+            ctx.lineTo(centreX, centreY);
+            ctx.fill();
+        }
+    }
+
+    Timer {
+        running: root.active
+        interval: 100
+        repeat: true
+
+        property int sumInterval: 0
+
+        onTriggered: {
+            if(sumInterval + interval > root.interval) {
+                sumInterval = 0
+            } else {
+                sumInterval += interval
+            }
+            root.progress = (sumInterval * interval) / root.interval
+            canvas.requestPaint();
+        }
+    }
+
+    anchors.verticalCenter: parent.verticalCenter
 }
diff --git a/plasma5-genial/contents/ui/TimerProgressBar.qml b/plasma5-genial/contents/ui/TimerProgressBar.qml
diff --git a/plasma5-genial/contents/ui/representations/RunningRepresentation.qml b/plasma5-genial/contents/ui/representations/RunningRepresentation.qml
@@ -32,16 +32,6 @@ AppRepresentation {
         trackTitle: trackDataContainer.title
         anchors.fill: parent
 
-
-        TimerProgressBar {
-            id: progressBar
-
-            targetValue: descriptionHolder.interval
-            running: !descriptionHolder.isEmpty
-            opacity: descriptionHolder.isEmpty ? 0 : 1
-            anchors.fill: parent
-        }
-
         Row {
 
             spacing: 8
@@ -55,6 +45,7 @@ AppRepresentation {
                 BulletsDelegate {
                     active: descriptionHolder.currentIndex === index
                     onClicked: descriptionHolder.currentIndex = index
+                    interval: active ? descriptionHolder.interval : 0
                 }
             }