From a67ee784b35afd7cc42fd22819361c21e1153f2c Mon Sep 17 00:00:00 2001 From: crschnick Date: Wed, 9 Aug 2023 06:22:12 +0000 Subject: [PATCH] Tray improvements --- app/build.gradle | 6 +++++- app/src/main/java/io/xpipe/app/core/AppTray.java | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 9e15cc91a..c26673e10 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -105,7 +105,6 @@ List jvmRunArgs = [ "--add-opens", "java.base/java.lang=io.xpipe.core", "--add-opens", "com.dustinredmond.fxtrayicon/com.dustinredmond.fxtrayicon=io.xpipe.app", "--add-opens", "java.desktop/java.awt=io.xpipe.app", - "--add-opens", "java.desktop/sun.awt.X11=io.xpipe.app", "--add-opens", "net.synedra.validatorfx/net.synedra.validatorfx=io.xpipe.app", "--add-opens", 'com.dlsc.preferencesfx/com.dlsc.preferencesfx.view=io.xpipe.app', "--add-opens", 'com.dlsc.preferencesfx/com.dlsc.preferencesfx.model=io.xpipe.app', @@ -117,6 +116,11 @@ List jvmRunArgs = [ "-Dvisualvm.display.name=XPipe" ] +import org.gradle.internal.os.OperatingSystem + +if (OperatingSystem.current() == OperatingSystem.LINUX) { + jvmRunArgs.addAll("--add-opens", "java.desktop/sun.awt.X11=io.xpipe.app") +} test { jvmArgs += jvmRunArgs diff --git a/app/src/main/java/io/xpipe/app/core/AppTray.java b/app/src/main/java/io/xpipe/app/core/AppTray.java index f81d272a3..e9bff3360 100644 --- a/app/src/main/java/io/xpipe/app/core/AppTray.java +++ b/app/src/main/java/io/xpipe/app/core/AppTray.java @@ -23,7 +23,7 @@ public class AppTray { @SneakyThrows private AppTray() { - var url = AppResources.getResourceURL(AppResources.XPIPE_MODULE, "img/logo/logo_48x48.png").orElseThrow(); + var url = AppResources.getResourceURL(AppResources.XPIPE_MODULE, "img/logo/logo_128x128.png").orElseThrow(); var builder = new FXTrayIcon.Builder(App.getApp().getStage(), url) .menuItem(AppI18n.get("open"), e -> { @@ -78,6 +78,7 @@ public class AppTray { }); }); + // Ugly fix to show a transparent background on Linux if (OsType.getLocal().equals(OsType.LINUX)) { SwingUtilities.invokeLater(() -> { try {