diff --git a/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/app/TimeCalcApp.java b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/app/TimeCalcApp.java index 3e43960..d4dddec 100644 --- a/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/app/TimeCalcApp.java +++ b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/app/TimeCalcApp.java @@ -41,6 +41,7 @@ public class TimeCalcApp { @Getter private SqliteConnectionFactory sqliteConnectionFactory; + public static final boolean IS_RUNNING_ON_LINUX = System.getProperty("os.name").equals("Linux"); public void start(String[] args) throws IOException { File dbFile = new File(FileConstants.TC_DIRECTORY.getAbsolutePath() + "/" + "time-calc.sqlite3"); File dbFileBackup = new File(dbFile.getAbsolutePath() + ".backup." + DateFormats.DATE_TIME_FORMATTER_SHORT.format(new Date()).substring(0, 10) + ".sqlite3"); 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 83446f3..ae19fdf 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 @@ -31,6 +31,7 @@ import java.util.List; import java.util.Locale; import java.util.function.Consumer; import javax.swing.JMenuItem; +import org.nanoboot.utils.timecalc.app.TimeCalcApp; import static org.nanoboot.utils.timecalc.swing.progress.battery.Battery.HIGH_STRONGLY_COLORED; import static org.nanoboot.utils.timecalc.swing.progress.battery.Battery.HIGH_WEAKLY_COLORED; import static org.nanoboot.utils.timecalc.swing.progress.battery.Battery.LIGHT_RED; @@ -471,7 +472,7 @@ public class Widget extends JPanel implements y = y - 2; } if(paintBody) { - brush.drawString(BODY, x - 5, y + 26); + brush.drawString(BODY, x - 5 + (TimeCalcApp.IS_RUNNING_ON_LINUX && getClass() == ProgressSwing.class ? - 4 : 0), y + 26); brush.drawString(LEGS, x - 5, y + 36); } } diff --git a/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/windows/ConfigWindow.java b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/windows/ConfigWindow.java index 9044af7..76ff4c3 100644 --- a/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/windows/ConfigWindow.java +++ b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/windows/ConfigWindow.java @@ -397,7 +397,7 @@ public class ConfigWindow extends TWindow { button.addActionListener(e -> { visibilityDefaultProperty - .setSelectedItem(Visibility.GRAY.name()); + .setSelectedItem(enable ? Visibility.STRONGLY_COLORED.name() : Visibility.GRAY.name()); clockVisibleProperty.setSelected(true); clockHandsHourVisibleProperty.setSelected(enable); clockHandsMinuteVisibleProperty.setSelected(enable);