Fixed ProgressSwing - body position and enable almost everything feature was a very little changed

This commit is contained in:
Robert Vokac 2024-03-30 17:26:07 +01:00
parent c549105284
commit e50c5da63d
No known key found for this signature in database
GPG Key ID: 693D30BEE3329055
3 changed files with 4 additions and 2 deletions

View File

@ -41,6 +41,7 @@ public class TimeCalcApp {
@Getter @Getter
private SqliteConnectionFactory sqliteConnectionFactory; private SqliteConnectionFactory sqliteConnectionFactory;
public static final boolean IS_RUNNING_ON_LINUX = System.getProperty("os.name").equals("Linux");
public void start(String[] args) throws IOException { public void start(String[] args) throws IOException {
File dbFile = new File(FileConstants.TC_DIRECTORY.getAbsolutePath() + "/" + "time-calc.sqlite3"); 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"); File dbFileBackup = new File(dbFile.getAbsolutePath() + ".backup." + DateFormats.DATE_TIME_FORMATTER_SHORT.format(new Date()).substring(0, 10) + ".sqlite3");

View File

@ -31,6 +31,7 @@ import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.function.Consumer; import java.util.function.Consumer;
import javax.swing.JMenuItem; 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_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.HIGH_WEAKLY_COLORED;
import static org.nanoboot.utils.timecalc.swing.progress.battery.Battery.LIGHT_RED; 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; y = y - 2;
} }
if(paintBody) { 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); brush.drawString(LEGS, x - 5, y + 36);
} }
} }

View File

@ -397,7 +397,7 @@ public class ConfigWindow extends TWindow {
button.addActionListener(e -> { button.addActionListener(e -> {
visibilityDefaultProperty visibilityDefaultProperty
.setSelectedItem(Visibility.GRAY.name()); .setSelectedItem(enable ? Visibility.STRONGLY_COLORED.name() : Visibility.GRAY.name());
clockVisibleProperty.setSelected(true); clockVisibleProperty.setSelected(true);
clockHandsHourVisibleProperty.setSelected(enable); clockHandsHourVisibleProperty.setSelected(enable);
clockHandsMinuteVisibleProperty.setSelected(enable); clockHandsMinuteVisibleProperty.setSelected(enable);