From f67c8dd429934dc0435be33906f150990ec16d1a Mon Sep 17 00:00:00 2001 From: liach Date: Fri, 3 May 2019 06:20:34 -0700 Subject: Few minor render tweaks (#127) Now inheritance tree bleak color no longer affects other trees Also add a github link Signed-off-by: liach --- src/main/java/cuchaz/enigma/gui/Gui.java | 2 +- .../java/cuchaz/enigma/gui/MethodTreeCellRenderer.java | 8 +++++--- src/main/java/cuchaz/enigma/gui/elements/MenuBar.java | 14 ++++++++++++++ 3 files changed, 20 insertions(+), 4 deletions(-) (limited to 'src/main/java/cuchaz') diff --git a/src/main/java/cuchaz/enigma/gui/Gui.java b/src/main/java/cuchaz/enigma/gui/Gui.java index a6043234..47844485 100644 --- a/src/main/java/cuchaz/enigma/gui/Gui.java +++ b/src/main/java/cuchaz/enigma/gui/Gui.java @@ -171,7 +171,7 @@ public class Gui { } }); TreeCellRenderer cellRenderer = inheritanceTree.getCellRenderer(); - inheritanceTree.setCellRenderer(new MethodTreeCellRenderer((DefaultTreeCellRenderer) cellRenderer)); + inheritanceTree.setCellRenderer(new MethodTreeCellRenderer(cellRenderer)); JPanel inheritancePanel = new JPanel(); inheritancePanel.setLayout(new BorderLayout()); diff --git a/src/main/java/cuchaz/enigma/gui/MethodTreeCellRenderer.java b/src/main/java/cuchaz/enigma/gui/MethodTreeCellRenderer.java index c78ead23..05d90a97 100644 --- a/src/main/java/cuchaz/enigma/gui/MethodTreeCellRenderer.java +++ b/src/main/java/cuchaz/enigma/gui/MethodTreeCellRenderer.java @@ -12,6 +12,7 @@ package cuchaz.enigma.gui; import cuchaz.enigma.analysis.MethodInheritanceTreeNode; +import cuchaz.enigma.config.Config; import javax.swing.*; import javax.swing.tree.TreeCellRenderer; @@ -28,11 +29,12 @@ class MethodTreeCellRenderer implements TreeCellRenderer { @Override public Component getTreeCellRendererComponent(JTree tree, Object value, boolean selected, boolean expanded, boolean leaf, int row, boolean hasFocus) { Component ret = parent.getTreeCellRendererComponent(tree, value, selected, expanded, leaf, row, hasFocus); - if (value instanceof MethodInheritanceTreeNode && ((MethodInheritanceTreeNode) value).isImplemented()) { - ret.setForeground(Color.BLACK); + Config config = Config.getInstance(); + if (!(value instanceof MethodInheritanceTreeNode) || ((MethodInheritanceTreeNode) value).isImplemented()) { + ret.setForeground(new Color(config.defaultTextColor)); ret.setFont(ret.getFont().deriveFont(Font.PLAIN)); } else { - ret.setForeground(Color.GRAY); + ret.setForeground(new Color(config.numberColor)); ret.setFont(ret.getFont().deriveFont(Font.ITALIC)); } return ret; diff --git a/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java b/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java index 44ea2fdd..98275b4a 100644 --- a/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java +++ b/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java @@ -8,10 +8,14 @@ import cuchaz.enigma.gui.dialog.SearchDialog; import cuchaz.enigma.translation.mapping.serde.MappingFormat; import javax.swing.*; +import java.awt.*; import java.awt.event.InputEvent; import java.awt.event.KeyEvent; import java.io.File; import java.io.IOException; +import java.net.MalformedURLException; +import java.net.URISyntaxException; +import java.net.URL; import java.util.jar.JarFile; public class MenuBar extends JMenuBar { @@ -213,6 +217,16 @@ public class MenuBar extends JMenuBar { menu.add(item); item.addActionListener(event -> AboutDialog.show(this.gui.getFrame())); } + { + JMenuItem item = new JMenuItem("GitHub Page"); + menu.add(item); + item.addActionListener(event -> { + try { + Desktop.getDesktop().browse(new URL("https://github.com/FabricMC/Enigma").toURI()); + } catch (URISyntaxException | IOException ignored) { + } + }); + } } } } -- cgit v1.2.3