From 5291779733e83aed193679ad809469219fe8fdfb Mon Sep 17 00:00:00 2001 From: Robert Vokac Date: Sat, 9 Mar 2024 15:22:52 +0000 Subject: [PATCH] Added some improvements --- .../org/nanoboot/utils/timecalc/swing/common/MainWindow.java | 2 +- .../java/org/nanoboot/utils/timecalc/swing/common/Widget.java | 4 +--- .../utils/timecalc/swing/progress/ProgressSquare.java | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/common/MainWindow.java b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/common/MainWindow.java index 2c9bb65..7cc2f1c 100644 --- a/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/common/MainWindow.java +++ b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/common/MainWindow.java @@ -743,7 +743,7 @@ public class MainWindow extends TWindow { .setDonePercent(YearBattery.getYearProgress(clock)); yearBattery.setLabel(""); - if (timeRemains.getHour() <= 0 && timeRemains.getMinute() <= 0) { + if (timeRemains.getHour() <= 0 && timeRemains.getMinute() <= 0 && timeRemains.getSecond() <= 0) { Toaster toasterManager = new Toaster(); toasterManager.setDisplayTime(30000); toasterManager.showToaster( diff --git a/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/common/Widget.java b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/common/Widget.java index 7f42d28..6917ad4 100644 --- a/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/common/Widget.java +++ b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/common/Widget.java @@ -165,9 +165,7 @@ public class Widget extends JPanel implements visibility != Visibility.NONE && visibleProperty.isEnabled()); paintWidget(brush); - if (mouseOver && mouseOverCloseButton) { - SwingUtils.paintCloseIcon(brush, getWidth()); - } + SwingUtils.paintCloseIcon(brush, getWidth(), mouseOver, mouseOverCloseButton); } diff --git a/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/progress/ProgressSquare.java b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/progress/ProgressSquare.java index 3484c03..2d3c4d9 100644 --- a/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/progress/ProgressSquare.java +++ b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/progress/ProgressSquare.java @@ -81,8 +81,8 @@ public class ProgressSquare extends Widget { .format(donePercent * 100) + "%", (int) (side / 8d * 3d), (int) (side / 8d * (donePercent > 0.5 ? 3d : 5d))); - paintSmiley(visibility, brush, (int) (side / 8d * 3d) + 65, - (int) ((side / 8d * (donePercent > 0.5 ? 3d : 5d)) - 16d)); + paintSmiley(visibility, brush, (int) (side / 8d * 3d), + (int) ((side / 8d * (donePercent > 0.5 ? 3d : 5d)) - 32d)); }