Better icon scaling on Linux

Author: rcx

src/main/java/club/bytecode/the/jda/Resources.java

@@ -1,6 +1,6 @@
 package club.bytecode.the.jda;
 
-import org.imgscalr.Scalr;
+import club.bytecode.the.jda.util.GuiUtils;
 
 import javax.imageio.ImageIO;
 import javax.swing.*;
@@ -36,6 +36,7 @@ public class Resources {
     public static ImageIcon javaIcon = new ImageIcon(Resources.class.getClass().getResource("/club/bytecode/the/jda/images/java.png"));
 
     public static ImageIcon fileNavigatorIcon = new ImageIcon(Resources.class.getClass().getResource("/club/bytecode/the/jda/images/icon.png"));
+    public static ImageIcon fileViewerIcon = new ImageIcon(Resources.class.getClass().getResource("/club/bytecode/the/jda/images/icon.png"));
 
     public static ArrayList<BufferedImage> iconList;
     public static BufferedImage icon;
@@ -50,11 +51,8 @@ public class Resources {
 
         iconList = new ArrayList<>();
         for (int size : new int[]{8, 16, 24, 32, 48, 64, 96, 128, 192, 256}) {
-            iconList.add(resize(icon, size, size));
+            iconList.add(GuiUtils.resize(icon, size, size));
         }
     }
 
-    public static BufferedImage resize(BufferedImage image, int width, int height) {
-        return Scalr.resize(image, Scalr.Method.ULTRA_QUALITY, width, height);
-    }
 }

src/main/java/club/bytecode/the/jda/gui/JDAWindow.java

@@ -2,8 +2,10 @@
 
 import club.bytecode.the.jda.JDA;
 import club.bytecode.the.jda.settings.IPersistentWindow;
+import club.bytecode.the.jda.util.GuiUtils;
 
 import javax.swing.*;
+import javax.swing.plaf.basic.BasicInternalFrameUI;
 import java.awt.*;
 import java.awt.event.ComponentAdapter;
 import java.awt.event.ComponentEvent;
@@ -30,7 +32,7 @@ public JDAWindow(final String id, final String title, final Icon icon) {
         super(title, true, true, true, true);
         windowId = id;
         setName(title);
-        setFrameIcon(icon);
+        setFrameIcon(GuiUtils.resize(icon, (int)  getTitleHeight(), (int) getTitleHeight()));
         setDefaultCloseOperation(JInternalFrame.HIDE_ON_CLOSE);
 
         unmaximizedPos = getDefaultPosition();
@@ -93,6 +95,10 @@ public void onJDAMaximized() {
             setSize(unmaximizedSize);
     }
 
+    private double getTitleHeight() {
+        return (((BasicInternalFrameUI) this.getUI()).getNorthPane()).getPreferredSize().getHeight();
+    }
+
     protected static Dimension defaultDimensions;
     protected static Point defaultPosition;
 

src/main/java/club/bytecode/the/jda/gui/navigation/FileNavigationPane.java

@@ -106,7 +106,7 @@ private void quickSearch(String qt) {
     }
 
     public FileNavigationPane() {
-        super("ClassNavigation", "File Navigator", Resources.fileNavigatorIcon);
+        super("ClassNavigation", "File Navigator", Resources.fileViewerIcon);
 
         tree.setRootVisible(false);
         tree.setShowsRootHandles(true);

src/main/java/club/bytecode/the/jda/util/GuiUtils.java

@@ -1,6 +1,10 @@
 package club.bytecode.the.jda.util;
 
+import org.imgscalr.Scalr;
+
+import javax.swing.*;
 import java.awt.*;
+import java.awt.image.BufferedImage;
 
 public class GuiUtils {
     public static void setWmClassName(String className) throws NoSuchFieldException, IllegalAccessException {
@@ -9,4 +13,17 @@ public static void setWmClassName(String className) throws NoSuchFieldException,
         awtAppClassNameField.setAccessible(true);
         awtAppClassNameField.set(xToolkit, className);
     }
+
+    public static BufferedImage resize(BufferedImage image, int width, int height) {
+        return Scalr.resize(image, Scalr.Method.ULTRA_QUALITY, width, height);
+    }
+
+    public static ImageIcon resize(Icon icon, int width, int height){
+        BufferedImage srcImg = new BufferedImage(icon.getIconWidth(), icon.getIconHeight(), BufferedImage.TYPE_INT_ARGB);
+        Graphics g = srcImg.createGraphics();
+        icon.paintIcon(null, g, 0,0);
+        g.dispose();
+        BufferedImage resized = resize(srcImg, width, height);
+        return new ImageIcon(resized);
+    }
 }