From b5fe5589d32ca37808b48a0f97809bd52bdc36a7 Mon Sep 17 00:00:00 2001 From: crschnick Date: Sun, 29 Sep 2024 16:40:19 +0000 Subject: [PATCH] Small fixes --- .../main/java/io/xpipe/app/core/AppLayoutModel.java | 2 +- app/src/main/java/io/xpipe/app/util/DesktopHelper.java | 7 ++++--- .../resources/io/xpipe/app/resources/style/style.css | 10 +++++++++- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/io/xpipe/app/core/AppLayoutModel.java b/app/src/main/java/io/xpipe/app/core/AppLayoutModel.java index df5f52e29..de0ffc4eb 100644 --- a/app/src/main/java/io/xpipe/app/core/AppLayoutModel.java +++ b/app/src/main/java/io/xpipe/app/core/AppLayoutModel.java @@ -131,7 +131,7 @@ public class AppLayoutModel { var zone = ZoneId.of(ZoneId.SHORT_IDS.get("PST")); var phStart = ZonedDateTime.of(2024, 10, 22, 0, 1, 0, 0, zone).toInstant(); var clicked = AppCache.get("phClicked",Boolean.class,() -> false); - var phShow = now.isAfter(phStart) && clicked; + var phShow = now.isAfter(phStart) && !clicked; if (phShow) { l.add(new Entry( new SimpleStringProperty("Product Hunt"), diff --git a/app/src/main/java/io/xpipe/app/util/DesktopHelper.java b/app/src/main/java/io/xpipe/app/util/DesktopHelper.java index 691187994..addb6bcd8 100644 --- a/app/src/main/java/io/xpipe/app/util/DesktopHelper.java +++ b/app/src/main/java/io/xpipe/app/util/DesktopHelper.java @@ -102,7 +102,7 @@ public class DesktopHelper { try { Desktop.getDesktop().open(file.toFile()); } catch (Exception e) { - ErrorEvent.fromThrowable(e).omit().handle(); + ErrorEvent.fromThrowable(e).expected().handle(); } }); } @@ -110,6 +110,7 @@ public class DesktopHelper { public static void browseFileInDirectory(Path file) { if (!Desktop.getDesktop().isSupported(Desktop.Action.BROWSE_FILE_DIR)) { if (!Desktop.getDesktop().isSupported(Desktop.Action.OPEN)) { + ErrorEvent.fromMessage("Desktop integration unable to open file " + file).expected().handle(); return; } @@ -117,7 +118,7 @@ public class DesktopHelper { try { Desktop.getDesktop().open(file.getParent().toFile()); } catch (Exception e) { - ErrorEvent.fromThrowable(e).omit().handle(); + ErrorEvent.fromThrowable(e).expected().handle(); } }); return; @@ -127,7 +128,7 @@ public class DesktopHelper { try { Desktop.getDesktop().browseFileDirectory(file.toFile()); } catch (Exception e) { - ErrorEvent.fromThrowable(e).omit().handle(); + ErrorEvent.fromThrowable(e).expected().handle(); } }); } diff --git a/app/src/main/resources/io/xpipe/app/resources/style/style.css b/app/src/main/resources/io/xpipe/app/resources/style/style.css index 44a619f1a..d7de51e8a 100644 --- a/app/src/main/resources/io/xpipe/app/resources/style/style.css +++ b/app/src/main/resources/io/xpipe/app/resources/style/style.css @@ -97,10 +97,18 @@ -fx-padding: 0.7em 1px 1em 1em; } -* { +.root:windows .text { -fx-font-smoothing-type: gray; } +.root:linux .text { + -fx-font-smoothing-type: lcd; +} + +.root:macos .text { + -fx-font-smoothing-type: lcd; +} + .radio-button { -fx-background-color: transparent; }