From b27d4698d061d310c96c7879488b2cdb56a45866 Mon Sep 17 00:00:00 2001
From: jt <51062134+jotbyte@users.noreply.github.com>
Date: Mon, 30 Mar 2020 13:41:52 -0400
Subject: [PATCH 1/2] Fix "Restore Window"

---
 app/src/main/java/xdman/ui/components/TrayHandler.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/xdman/ui/components/TrayHandler.java b/app/src/main/java/xdman/ui/components/TrayHandler.java
index a7234b6..d80d52d 100644
--- a/app/src/main/java/xdman/ui/components/TrayHandler.java
+++ b/app/src/main/java/xdman/ui/components/TrayHandler.java
@@ -111,7 +111,7 @@ public class TrayHandler {
 		MenuItem restoreItem = new MenuItem(StringResource.get("MSG_RESTORE"));
 		restoreItem.setFont(FontResource.getBigFont());
 		restoreItem.addActionListener(act);
-		addClipItem.setName("ADD_CLIP");
+		restoreItem.setName("RESTORE");
 		CheckboxMenuItem monitoringItem = new CheckboxMenuItem(StringResource.get("BROWSER_MONITORING"));
 		monitoringItem.addItemListener(new ItemListener() {
 

From 3086e41dbfd42964c49380b5f4c6a64f31ab8213 Mon Sep 17 00:00:00 2001
From: jt <51062134+jotbyte@users.noreply.github.com>
Date: Mon, 30 Mar 2020 18:38:09 -0400
Subject: [PATCH 2/2] Improve Dock support for macOS

- fixed Dock icon
- fixed Dock icon click which is supposed to reopen xdm
---
 .../main/java/xdman/ui/components/MainWindow.java  | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/xdman/ui/components/MainWindow.java b/app/src/main/java/xdman/ui/components/MainWindow.java
index 87cd39b..83b9030 100644
--- a/app/src/main/java/xdman/ui/components/MainWindow.java
+++ b/app/src/main/java/xdman/ui/components/MainWindow.java
@@ -913,7 +913,17 @@ public class MainWindow extends XDMFrame implements ActionListener {
 
 	private void initWindow() {
 		setIconImage(ImageResource.get("icon.png").getImage());
-
+		/* Set Dock icon in macOS */
+		try {
+			Taskbar.getTaskbar().setIconImage(ImageResource.get("icon.png").getImage());
+		} catch (final UnsupportedOperationException | SecurityException e) {
+			System.out.println("Error setting Dock icon");
+		}
+		/* Re-open XDM from dock on macOS */
+		if (XDMUtils.detectOS() == XDMUtils.MAC){
+			Desktop.getDesktop().addAppEventListener((AppReopenedListener) e -> XDMApp.getInstance().showMainWindow());
+		}
+		
 		showTwitterIcon = true;
 		showFBIcon = true;
 		showGitHubIcon = true;
@@ -1512,4 +1522,4 @@ public class MainWindow extends XDMFrame implements ActionListener {
 	// hd.start();
 	// }
 
-}
\ No newline at end of file
+}