From bea3c7c693ae975d1fade82f6caa878a736d02b3 Mon Sep 17 00:00:00 2001
From: crschnick <crschnick@xpipe.io>
Date: Wed, 9 Aug 2023 05:52:10 +0000
Subject: [PATCH] Try to improve tray icon look

---
 app/build.gradle                              |  1 +
 .../main/java/io/xpipe/app/core/AppTray.java  | 23 +++++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/app/build.gradle b/app/build.gradle
index e2613f529..2b4c09c6e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -104,6 +104,7 @@ List<String> jvmRunArgs = [
         "--add-opens", "java.base/java.lang.reflect=com.jfoenix",
         "--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", "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',
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 4a9e9cfd2..f81d272a3 100644
--- a/app/src/main/java/io/xpipe/app/core/AppTray.java
+++ b/app/src/main/java/io/xpipe/app/core/AppTray.java
@@ -4,11 +4,13 @@ import com.dustinredmond.fxtrayicon.FXTrayIcon;
 import io.xpipe.app.core.mode.OperationMode;
 import io.xpipe.app.issue.ErrorEvent;
 import io.xpipe.app.issue.ErrorHandler;
+import io.xpipe.core.process.OsType;
 import javafx.application.Platform;
 import lombok.SneakyThrows;
 
 import javax.swing.*;
 import java.awt.*;
+import java.lang.reflect.Field;
 import java.time.Duration;
 import java.time.Instant;
 
@@ -46,6 +48,7 @@ public class AppTray {
                     OperationMode.close();
                 })
                 .toolTip("XPipe")
+                .applicationTitle("XPipe")
                 .build();
         this.errorHandler = new TrayErrorHandler();
 
@@ -63,6 +66,7 @@ public class AppTray {
         return INSTANCE;
     }
 
+    @SneakyThrows
     public void show() {
         icon.show();
 
@@ -73,6 +77,25 @@ public class AppTray {
                 OperationMode.switchToAsync(OperationMode.GUI);
             });
         });
+
+        if (OsType.getLocal().equals(OsType.LINUX)) {
+            SwingUtilities.invokeLater(() -> {
+                try {
+                    Field peerField = null;
+                    peerField = TrayIcon.class.getDeclaredField("peer");
+                    peerField.setAccessible(true);
+                    var peer = peerField.get(this.privateTrayIcon);
+
+                    var canvasField = peer.getClass().getDeclaredField("canvas");
+                    canvasField.setAccessible(true);
+                    Component canvas = (Component) canvasField.get(peer);
+
+                    canvas.setBackground(new Color(0, 0, 0, 0));
+                } catch (Exception e) {
+                    ErrorEvent.fromThrowable(e).omit().handle();
+                }
+            });
+        }
     }
 
     public void hide() {