diff --git a/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/app/TimeCalcManager.java b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/app/TimeCalcManager.java index f24149d..4c331ba 100644 --- a/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/app/TimeCalcManager.java +++ b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/app/TimeCalcManager.java @@ -528,6 +528,11 @@ public class TimeCalcManager { window.setSize(520 + 20 + 100, exitButton.getY() + 3 * exitButton.getHeight() + MARGIN); while (true) { + Visibility visibility = Visibility + .valueOf(timeCalcApp.visibilityProperty.getValue()); + if(timeCalcConfiguration.visibilityOnlyGreyOrNoneEnabledProperty.isEnabled() && visibility.isColored() ){ + timeCalcApp.visibilityProperty.setValue(Visibility.GRAY.name()); + } //time.writeString(); if (stopBeforeEnd) { window.setVisible(false); @@ -535,8 +540,7 @@ public class TimeCalcManager { break; } - Visibility visibility = Visibility - .valueOf(timeCalcApp.visibilityProperty.getValue()); + componentRegistry.setVisible(visibility.isNotNone()); if (!visibility.isStronglyColored() || visibility.isGray()) { configButton.setBackground(BG); diff --git a/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/entity/Visibility.java b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/entity/Visibility.java index 47a79d6..07f6d38 100644 --- a/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/entity/Visibility.java +++ b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/entity/Visibility.java @@ -21,6 +21,9 @@ public enum Visibility { return this == WEAKLY_COLORED; } + public boolean isColored() { + return isStronglyColored() || isWeaklyColored(); + } public boolean isGray() { return this == GRAY; } diff --git a/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/common/TimeCalcButton.java b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/common/TimeCalcButton.java index f005a26..c120864 100644 --- a/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/common/TimeCalcButton.java +++ b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/common/TimeCalcButton.java @@ -24,13 +24,13 @@ public class TimeCalcButton extends JButton { public TimeCalcButton(String label) { super(label); + new Timer(100, e -> repaint()).start(); } public void setBounds(int x, int y) { setBounds(x, y, BUTTON_WIDTH, BUTTON_HEIGHT); this.originalBackground = getBackground(); this.originalForeground = getForeground(); - new Timer(100, e -> repaint()).start(); } public void setOriginalBackground() { diff --git a/timecalc.conf b/timecalc.conf index 4e8c5e8..614b5aa 100644 --- a/timecalc.conf +++ b/timecalc.conf @@ -1,10 +1,10 @@ clock.hands.long=true -clock.hands.minute.enabled=false +clock.hands.minute.enabled=true clock.hands.second.enabled=true clock.hands.millisecond.enabled=false battery.waves.enabled=true default-visibility=STRONGLY_COLORED -visibility.only-grey-or-none.enabled=true +visibility.only-grey-or-none.enabled=false jokes.enabled=true commands.enabled=true toasts.enabled=true