Tray Icon: try to select the icon image with the correct size - other…

…wise scale the largest one accordingly
bwRavencl · May 11, 2024 · cee7d05 · cee7d05
1 parent f66b72e
commit cee7d05
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/src/main/java/de/bwravencl/controllerbuddy/gui/Main.java b/src/main/java/de/bwravencl/controllerbuddy/gui/Main.java
@@ -2119,7 +2119,18 @@ private void onControllersChanged(final List<ControllerInfo> presentControllers,
 			quitMenuItem.addActionListener(quitAction);
 			popupMenu.add(quitMenuItem);
 
-			trayIcon = new TrayIcon(frame.getIconImage());
+			final var trayIconSize = systemTray.getTrayIconSize();
+			final var trayIconImage = frame.getIconImages().stream()
+					.filter(iconImage -> iconImage.getWidth(null) == trayIconSize.width
+							&& iconImage.getWidth(null) == trayIconSize.height)
+					.findFirst()
+					.orElse(frame.getIconImages().stream()
+							.max(Comparator
+									.comparingInt(iconImage -> iconImage.getWidth(null) * iconImage.getHeight(null)))
+							.orElseThrow()
+							.getScaledInstance(trayIconSize.width, trayIconSize.height, Image.SCALE_SMOOTH));
+
+			trayIcon = new TrayIcon(trayIconImage);
 			trayIcon.addActionListener(showAction);
 			trayIcon.setPopupMenu(popupMenu);
 			try {