Fix mac OS dock icon display issue.

hellodlyn · Jul 30, 2018 · c06d069 · c06d069
1 parent 9b8072b
commit c06d069
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/main/src/main/java/org/pdown/gui/DownApplication.java b/main/src/main/java/org/pdown/gui/DownApplication.java
@@ -9,6 +9,7 @@
 import java.awt.SystemTray;
 import java.awt.Toolkit;
 import java.awt.TrayIcon;
+import java.lang.reflect.Method;
 import java.net.URL;
 import javafx.application.Platform;
 import javafx.geometry.Insets;
@@ -44,12 +45,28 @@ public class DownApplication extends AbstractJavaFxApplicationSupport {
   public void start(Stage primaryStage) throws Exception {
     this.stage = primaryStage;
     Platform.setImplicitExit(false);
+    handleMacDockIcon();
     loadTray();
     loadBrowser();
     loadWindow();
     show();
   }
 
+  private void handleMacDockIcon() {
+    if (OsUtil.isMac()) {
+      try {
+        Class<?> appClass = Class.forName("com.apple.eawt.Application");
+        Method getApplication = appClass.getMethod("getApplication");
+        Object application = getApplication.invoke(appClass);
+        Method setDockIconImage = appClass.getMethod("setDockIconImage", Image.class);
+        URL url = Thread.currentThread().getContextClassLoader().getResource("mac/dock_logo.png");
+        Image image = Toolkit.getDefaultToolkit().getImage(url);
+        setDockIconImage.invoke(application, image);
+      } catch (Exception e) {
+      }
+    }
+  }
+
   //加载托盘
   private void loadTray() throws AWTException {
     if (SystemTray.isSupported()) {

diff --git a/main/src/main/resources/mac/dock_logo.png b/main/src/main/resources/mac/dock_logo.png
diff --git a/runner/src/main/java/org/pdown/gui/Runner.java b/runner/src/main/java/org/pdown/gui/Runner.java
@@ -17,7 +17,7 @@ public static void main(String[] args) throws IOException {
           JAVA_CMD_PATH,
           "-jar",
           "-Dfile.encoding=GBK",
-          "-Dapple.awt.UIElement=true",
+          //"-Dapple.awt.UIElement=true",
           "-Xms128m",
           "-Xmx256m",
           MAIN_JAR_PATH