2 files changed, 81 insertions, 0 deletions

diff --git a/src/main/java/cuchaz/enigma/gui/util/AbstractListCellRenderer.java b/src/main/java/cuchaz/enigma/gui/util/AbstractListCellRenderer.java
new file mode 100644
index 0000000..e071fe1
--- /dev/null
+++ b/src/main/java/cuchaz/enigma/gui/util/AbstractListCellRenderer.java
@@ -0,0 +1,75 @@
+package cuchaz.enigma.gui.util;
+
+import java.awt.Component;
+import java.awt.event.MouseEvent;
+
+import javax.swing.*;
+import javax.swing.border.Border;
+
+public abstract class AbstractListCellRenderer<E> extends JPanel implements ListCellRenderer<E> {
+
+        private static final Border NO_FOCUS_BORDER = BorderFactory.createEmptyBorder(1, 1, 1, 1);
+
+        public AbstractListCellRenderer() {
+                setBorder(getNoFocusBorder());
+        }
+
+        protected Border getNoFocusBorder() {
+                Border border = UIManager.getLookAndFeel().getDefaults().getBorder("List.List.cellNoFocusBorder");
+                if (border == null) {
+                        return NO_FOCUS_BORDER;
+                }
+                return border;
+        }
+
+        protected Border getBorder(boolean isSelected, boolean cellHasFocus) {
+                Border b = null;
+                if (cellHasFocus) {
+                        UIDefaults defaults = UIManager.getLookAndFeel().getDefaults();
+                        if (isSelected) {
+                                b = defaults.getBorder("List.focusSelectedCellHighlightBorder");
+                        }
+                        if (b == null) {
+                                b = defaults.getBorder("List.focusCellHighlightBorder");
+                        }
+                } else {
+                        b = getNoFocusBorder();
+                }
+                return b;
+        }
+
+        public abstract void updateUiForEntry(JList<? extends E> list, E value, int index, boolean isSelected, boolean cellHasFocus);
+
+        @Override
+        public Component getListCellRendererComponent(JList<? extends E> list, E value, int index, boolean isSelected, boolean cellHasFocus) {
+                updateUiForEntry(list, value, index, isSelected, cellHasFocus);
+
+                if (isSelected) {
+                        setBackground(list.getSelectionBackground());
+                        setForeground(list.getSelectionForeground());
+                } else {
+                        setBackground(list.getBackground());
+                        setForeground(list.getForeground());
+                }
+
+                setEnabled(list.isEnabled());
+                setFont(list.getFont());
+
+                setBorder(getBorder(isSelected, cellHasFocus));
+
+                // This isn't the width of the cell, but it's close enough for where it's needed (getComponentAt in getToolTipText)
+                setSize(list.getWidth(), getPreferredSize().height);
+
+                return this;
+        }
+
+        @Override
+        public String getToolTipText(MouseEvent event) {
+                Component c = getComponentAt(event.getPoint());
+                if (c instanceof JComponent) {
+                        return ((JComponent) c).getToolTipText();
+                }
+                return getToolTipText();
+        }
+
+}
diff --git a/src/main/java/cuchaz/enigma/gui/util/ScaleUtil.java b/src/main/java/cuchaz/enigma/gui/util/ScaleUtil.java
index 8bc826f..9f722e9 100644
--- a/src/main/java/cuchaz/enigma/gui/util/ScaleUtil.java
+++ b/src/main/java/cuchaz/enigma/gui/util/ScaleUtil.java
@@ -7,7 +7,9 @@ import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.swing.BorderFactory;
 import javax.swing.UIManager;
+import javax.swing.border.Border;
 
 import com.github.swingdpi.UiDefaultsScaler;
 import com.github.swingdpi.plaf.BasicTweaker;
@@ -69,6 +71,10 @@ public class ScaleUtil {
                 return (int) (i * getScaleFactor());
         }
 
+        public static Border createEmptyBorder(int top, int left, int bottom, int right) {
+                return BorderFactory.createEmptyBorder(scale(top), scale(left), scale(bottom), scale(right));
+        }
+
         public static int invert(int i) {
                 return (int) (i / getScaleFactor());
         }