More fixes

src/qz/ui/component/DisplayTable.java

@@ -1,11 +1,9 @@
 package qz.ui.component;
 
 import qz.utils.SystemUtilities;
-import qz.utils.UnixUtilities;
 
 import javax.swing.*;
 import javax.swing.table.DefaultTableModel;
-import java.awt.*;
 
 /**
  * Displays information in a JTable
@@ -31,6 +29,12 @@ private void initComponents() {
         model.addColumn("Field");
         model.addColumn("Value");
 
+        // Fix Linux row height
+        int origHeight = getRowHeight();
+        if(SystemUtilities.getWindowScaleFactor() != 1) {
+            setRowHeight((int)(origHeight * SystemUtilities.getWindowScaleFactor()));
+        }
+
         getTableHeader().setReorderingAllowed(false);
         setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
         setRowSelectionAllowed(true);
@@ -58,10 +62,11 @@ public void autoSize(int rows, int columns) {
             model.addRow(new Object[columns]);
         }
 
-        double scaleFactor = SystemUtilities.isLinux() ? UnixUtilities.getScaleFactor() : 1;
-        int normalWidth = (int)(getPreferredScrollableViewportSize().getWidth() * scaleFactor);
-        int autoHeight = (int)(getPreferredSize().getHeight() * scaleFactor);
-        setPreferredScrollableViewportSize(new Dimension(normalWidth, autoHeight));
+        setPreferredScrollableViewportSize(
+                SystemUtilities.scaleWindowDimension(
+                        getPreferredScrollableViewportSize().getWidth(),
+                        getPreferredSize().getHeight())
+        );
         setFillsViewportHeight(true);
         refreshComponents();
     }

src/qz/ui/component/IconCache.java

@@ -75,7 +75,7 @@ public enum Icon {
         BANNER_ICON("qz-banner.png");
 
         private boolean padded = false;
-        final String[] fileNames;
+        private String[] fileNames;
 
         /**
          * Default constructor
@@ -133,6 +133,11 @@ public String getId() {
         }
 
         public String[] getIds() { return fileNames; }
+
+        private void addId(String id) {
+            fileNames = Arrays.copyOf(fileNames, fileNames.length + 1);
+            fileNames[fileNames.length - 1] = id;
+        }
     }
 
     private final HashMap<String,ImageIcon> imageIcons;
@@ -161,6 +166,31 @@ private void buildIconCache() {
                 images.put(id, bi);
             }
         }
+        // Stash scaled 2x, 3x versions if missing
+        int maxScale = 3;
+        for(Icon i : Icon.values()) {
+            for(int scale = 2; scale <= maxScale; scale++) {
+                // Assume single-resource icons are lonely and want scaled instances
+                if (i.fileNames.length == 1) {
+                    BufferedImage bi = images.get(i.getId());
+                    // Assume square icon (filename is derived from width only)
+                    String id = i.getId();
+                    int loc = id.lastIndexOf(".");
+                    if(loc == -1) {
+                        continue;
+                    }
+                    String name = id.substring(0, loc);
+                    String ext = id.substring(loc + 1);
+                    String newSize = String.format("%s-%s.%s", name,  bi.getWidth() * scale, ext);
+                    if (!images.containsKey(newSize)) {
+                        i.addId(newSize);
+                        BufferedImage newBi = clone(bi, scale);
+                        imageIcons.put(newSize, new ImageIcon(newBi));
+                        images.put(newSize, newBi);
+                    }
+                }
+            }
+        }
     }
 
     /**
@@ -170,10 +200,20 @@ private void buildIconCache() {
      * @return the ImageIcon in the cache
      */
     public ImageIcon getIcon(Icon i) {
-        return imageIcons.get(i.getId());
+        return SystemUtilities.getWindowScaleFactor() != 1 ?
+                getIcon(i, true) : imageIcons.get(i.getId());
+    }
+
+    private ImageIcon getIcon(Icon i, boolean inferScale) {
+        if(!inferScale) {
+            return imageIcons.get(i.getId());
+        }
+        ImageIcon baseIcon = imageIcons.get(i.getId());
+        Dimension scaled = SystemUtilities.scaleWindowDimension(baseIcon.getIconWidth(), baseIcon.getIconHeight());
+        return imageIcons.get(i.getId(scaled));
     }
 
-    public ImageIcon getIcon(String id) {
+    private ImageIcon getIcon(String id) {
         return imageIcons.get(id);
     }
 
@@ -287,7 +327,11 @@ public void fixTrayIcons(boolean darkTaskbar) {
     }
 
     public static BufferedImage clone(BufferedImage src) {
-        Image tmp = src.getScaledInstance(src.getWidth(), src.getHeight(), src.getType());
+        return clone(src, 1);
+    }
+
+    public static BufferedImage clone(BufferedImage src, int scaleFactor) {
+        Image tmp = src.getScaledInstance(src.getWidth() * scaleFactor, src.getHeight() * scaleFactor, src.getType());
         BufferedImage dest = new BufferedImage(tmp.getWidth(null), tmp.getHeight(null), BufferedImage.TYPE_INT_ARGB);
         Graphics g = dest.createGraphics();
         g.drawImage(tmp, 0, 0, null);

src/qz/utils/SystemUtilities.java

@@ -55,6 +55,8 @@ public class SystemUtilities {
     private static final Os OS_TYPE = Os.bestMatch(OS_NAME);
     private static final Arch JRE_ARCH = Arch.bestMatch(OS_ARCH);
     private static final Logger log = LogManager.getLogger(TrayManager.class);
+
+    private static double windowScaleFactor = -1;
     private static final Locale defaultLocale = Locale.getDefault();
 
     static {
@@ -473,7 +475,7 @@ public static void centerDialog(Dialog dialog, Point position) {
         }
 
         //adjust for dpi scaling
-        double dpiScale = getWindowScaleFactor();
+        double dpiScale = getWindowScaleFactor(true);
         if (dpiScale == 0) {
             log.debug("Invalid window scale value: {}, we'll center on the primary monitor instead", dpiScale);
             dialog.setLocationRelativeTo(null);
@@ -517,7 +519,10 @@ public static boolean isWindowLocationValid(Rectangle window) {
      * See issues #284, #448
      * @return Logical dpi scale as dpi/96
      */
-    public static double getWindowScaleFactor() {
+    private static double getWindowScaleFactor(boolean forceRefresh) {
+        if(!forceRefresh && windowScaleFactor != -1) {
+            return windowScaleFactor;
+        }
         // MacOS is always 1
         if (isMac()) {
             return 1;
@@ -534,6 +539,22 @@ public static double getWindowScaleFactor() {
         return UnixUtilities.getScaleFactor();
     }
 
+    public static double getWindowScaleFactor() {
+        return getWindowScaleFactor(false);
+    }
+
+    public static Dimension scaleWindowDimension(Dimension orig) {
+        return scaleWindowDimension(orig.getWidth(), orig.getHeight());
+    }
+
+    public static Dimension scaleWindowDimension(double width, double height) {
+        double scaleFactor = getWindowScaleFactor();
+        return new Dimension(
+                (int)(width * scaleFactor),
+                (int)(height * scaleFactor)
+        );
+    }
+
     /**
      * Detects if HiDPI is enabled
      * Warning: Due to behavioral differences between OSs, JDKs and poor