From 2f63829139609a0d48db32a1e6d4ad10a4f87e63 Mon Sep 17 00:00:00 2001
From: nathan <nathan@dorkbox.com>
Date: Sun, 16 Oct 2016 21:21:24 +0200
Subject: [PATCH] Moved system-properties debug output. Fixed "fixMacClick"
 logic

---
 src/dorkbox/systemTray/SystemTray.java | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/dorkbox/systemTray/SystemTray.java b/src/dorkbox/systemTray/SystemTray.java
index 144c8a6..bb959d9 100644
--- a/src/dorkbox/systemTray/SystemTray.java
+++ b/src/dorkbox/systemTray/SystemTray.java
@@ -211,6 +211,13 @@ class SystemTray implements Menu {
 
         systemTray = new SystemTray();
 
+//        if (DEBUG) {
+//            Properties properties = System.getProperties();
+//            for (Map.Entry<Object, Object> entry : properties.entrySet()) {
+//                logger.debug(entry.getKey() + " : " + entry.getValue());
+//            }
+//        }
+
         // no tray in a headless environment
         if (GraphicsEnvironment.isHeadless()) {
             logger.error("Cannot use the SystemTray in a headless environment");
@@ -369,11 +376,6 @@ class SystemTray implements Menu {
 
             if (DEBUG) {
                 logger.debug("Currently using the '{}' desktop", XDG);
-
-//                Properties properties = System.getProperties();
-//                for (Map.Entry<Object, Object> entry : properties.entrySet()) {
-//                    logger.debug(entry.getKey() + " : " + entry.getValue());
-//                }
             }
 
             if (trayType == null) {
@@ -483,7 +485,7 @@ class SystemTray implements Menu {
             // windows is funky, and is hardcoded to 16x16. We fix that.
             SystemTrayFixes.fixWindows();
         }
-        else if (OS.isMacOsX()) {
+        else if (OS.isMacOsX() && useNativeMenus) {
             // macos doesn't respond to all buttons (but should)
             SystemTrayFixes.fixMacOS();
         }