From 6f65450f011ea7be102aaadb7fb081265d146485 Mon Sep 17 00:00:00 2001
From: Robert Vokac <robertvokac@nanoboot.org>
Date: Sat, 23 Mar 2024 18:11:07 +0100
Subject: [PATCH] Added ProgressDot III

---
 .../timecalc/swing/progress/ProgressDot.java     | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/progress/ProgressDot.java b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/progress/ProgressDot.java
index e4fe258..0e40b0e 100644
--- a/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/progress/ProgressDot.java
+++ b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/progress/ProgressDot.java
@@ -31,7 +31,7 @@ public class ProgressDot extends Widget {
 
     @Override
     public void paintWidget(Graphics g) {
-        int dotSize = 1;
+        int dotSize = 2;
         if (side == 0) {
             this.side = Math.min(getWidth(), getHeight()) / dotSize;
             this.square = side * side;
@@ -44,8 +44,8 @@ public class ProgressDot extends Widget {
         Double done = donePercent();
         int enabledDotsExpectedSize = (int) (done * square);
         int disabledDotsExpectedSize = square - enabledDotsExpectedSize;
-        System.out.println("enabledDots.size()=" + enabledDots.size());
-        System.out.println("disabledDots.size()=" + disabledDots.size());
+//        System.out.println("enabledDots.size()=" + enabledDots.size());
+//        System.out.println("disabledDots.size()=" + disabledDots.size());
         while (enabledDots.size() > enabledDotsExpectedSize) {
             int randomIndex = (int) (enabledDots.size() * Math.random());
             Dot randomDot = enabledDots.remove(randomIndex);
@@ -67,17 +67,21 @@ public class ProgressDot extends Widget {
         Visibility visibility = Visibility.ofProperty(visibilityProperty);
         {
             if (visibility.isStronglyColored() || mouseOver) {
-                brush.setColor(Color.GRAY);
+                //brush.setColor(Color.GRAY);
+                brush.setColor(Battery.HIGHEST_WEAKLY_COLORED);
             }
 
+            
             for (Dot d : enabledDots) {
                 brush.fillRect(((d.x - 1) * dotSize) + d.x, ((d.y - 1) * dotSize) + d.y, dotSize+(dotSize > 1 ? 1 : 1), dotSize+(dotSize > 1 ? 1 : 1));
+                //brush.drawLine(d.x, d.y, d.x, d.y);
             }
             if(visibility.isStronglyColored()){
             //Color currentColor = brush.getColor();
             brush.setColor(Battery.LOW_WEAKLY_COLORED);
             for (Dot d : disabledDots) {
                 brush.fillRect(((d.x - 1) * dotSize) + d.x, ((d.y - 1) * dotSize) + d.y, dotSize+(dotSize > 1 ? 1 : 1), dotSize+(dotSize > 1 ? 1 : 1));
+                //brush.drawLine(d.x, d.y, d.x, d.y);
             }
             //brush.setColor(currentColor);
             }
@@ -89,9 +93,9 @@ public class ProgressDot extends Widget {
         brush.drawString(NumberFormats.FORMATTER_FIVE_DECIMAL_PLACES
                 .format(donePercent() * 100) + "%",
                 (int) (side / 8d * 3d),
-                (int) (side / 8d * (donePercent() > 0.5 ? 3d : 5d)));
+                (int) (side / 8d * (5d)));
         paintSmiley(visibility, brush, (int) (side / 8d * 3d),
-                (int) ((side / 8d * (donePercent() > 0.5 ? 3d : 5d)) - 32d));
+                (int) ((side / 8d * (5d)) - 32d));
 
     }