fix: member tray laf

isHarryh · Nov 10, 2024 · 6467fda · 6467fda
1 parent 4e452a1
commit 6467fda
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 12 deletions.
diff --git a/core/src/cn/harryh/arkpets/tray/MemberTray.java b/core/src/cn/harryh/arkpets/tray/MemberTray.java
@@ -23,16 +23,14 @@ public abstract class MemberTray {
 
     static {
         // Avoid AWT Thread problem.
-        SwingUtilities.invokeLater(() -> {
-            try {
-                String laf = UIManager.getSystemLookAndFeelClassName();
-                if (laf.contains("WindowsLookAndFeel")) {
-                    UIManager.put("MenuItem.margin",new Insets(2,-15,2,2));
-                    UIManager.put("Menu.margin",new Insets(2,-15,2,2));
-                }
-                UIManager.setLookAndFeel(laf);
-            } catch (Exception ignored) {}
-        });
+        try {
+            String laf = UIManager.getSystemLookAndFeelClassName();
+            if (laf.contains("WindowsLookAndFeel")) {
+                UIManager.put("MenuItem.margin", new Insets(2, -15, 2, 2));
+                UIManager.put("Menu.margin", new Insets(2, -15, 2, 2));
+            }
+            UIManager.setLookAndFeel(laf);
+        } catch (Exception ignored) {}
         Const.FontsConfig.loadFontsToSwing();
     }
 

diff --git a/core/src/cn/harryh/arkpets/tray/MemberTrayImpl.java b/core/src/cn/harryh/arkpets/tray/MemberTrayImpl.java
@@ -69,8 +69,6 @@ public void firePopupMenuWillBecomeInvisible() {
             onDisconnected();
             client.connectWithRetry(onConnected, session);
         }
-        SwingUtilities.updateComponentTreeUI(popMenu);
-        popMenu.pack();
     }
 
     private static String getName(ArkPets boundArkPets) {