summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar liach2019-05-03 06:20:34 -0700
committerGravatar Gegy2019-05-03 15:20:34 +0200
commitf67c8dd429934dc0435be33906f150990ec16d1a (patch)
treee1a757dd0bbb5bb7b036c6e3afa85c42d0a0d77f /src
parentupdate procyon (diff)
downloadenigma-f67c8dd429934dc0435be33906f150990ec16d1a.tar.gz
enigma-f67c8dd429934dc0435be33906f150990ec16d1a.tar.xz
enigma-f67c8dd429934dc0435be33906f150990ec16d1a.zip
Few minor render tweaks (#127)
Now inheritance tree bleak color no longer affects other trees Also add a github link Signed-off-by: liach <liach@users.noreply.github.com>
Diffstat (limited to 'src')
-rw-r--r--src/main/java/cuchaz/enigma/gui/Gui.java2
-rw-r--r--src/main/java/cuchaz/enigma/gui/MethodTreeCellRenderer.java8
-rw-r--r--src/main/java/cuchaz/enigma/gui/elements/MenuBar.java14
3 files changed, 20 insertions, 4 deletions
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 {
171 } 171 }
172 }); 172 });
173 TreeCellRenderer cellRenderer = inheritanceTree.getCellRenderer(); 173 TreeCellRenderer cellRenderer = inheritanceTree.getCellRenderer();
174 inheritanceTree.setCellRenderer(new MethodTreeCellRenderer((DefaultTreeCellRenderer) cellRenderer)); 174 inheritanceTree.setCellRenderer(new MethodTreeCellRenderer(cellRenderer));
175 175
176 JPanel inheritancePanel = new JPanel(); 176 JPanel inheritancePanel = new JPanel();
177 inheritancePanel.setLayout(new BorderLayout()); 177 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 @@
12package cuchaz.enigma.gui; 12package cuchaz.enigma.gui;
13 13
14import cuchaz.enigma.analysis.MethodInheritanceTreeNode; 14import cuchaz.enigma.analysis.MethodInheritanceTreeNode;
15import cuchaz.enigma.config.Config;
15 16
16import javax.swing.*; 17import javax.swing.*;
17import javax.swing.tree.TreeCellRenderer; 18import javax.swing.tree.TreeCellRenderer;
@@ -28,11 +29,12 @@ class MethodTreeCellRenderer implements TreeCellRenderer {
28 @Override 29 @Override
29 public Component getTreeCellRendererComponent(JTree tree, Object value, boolean selected, boolean expanded, boolean leaf, int row, boolean hasFocus) { 30 public Component getTreeCellRendererComponent(JTree tree, Object value, boolean selected, boolean expanded, boolean leaf, int row, boolean hasFocus) {
30 Component ret = parent.getTreeCellRendererComponent(tree, value, selected, expanded, leaf, row, hasFocus); 31 Component ret = parent.getTreeCellRendererComponent(tree, value, selected, expanded, leaf, row, hasFocus);
31 if (value instanceof MethodInheritanceTreeNode && ((MethodInheritanceTreeNode) value).isImplemented()) { 32 Config config = Config.getInstance();
32 ret.setForeground(Color.BLACK); 33 if (!(value instanceof MethodInheritanceTreeNode) || ((MethodInheritanceTreeNode) value).isImplemented()) {
34 ret.setForeground(new Color(config.defaultTextColor));
33 ret.setFont(ret.getFont().deriveFont(Font.PLAIN)); 35 ret.setFont(ret.getFont().deriveFont(Font.PLAIN));
34 } else { 36 } else {
35 ret.setForeground(Color.GRAY); 37 ret.setForeground(new Color(config.numberColor));
36 ret.setFont(ret.getFont().deriveFont(Font.ITALIC)); 38 ret.setFont(ret.getFont().deriveFont(Font.ITALIC));
37 } 39 }
38 return ret; 40 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;
8import cuchaz.enigma.translation.mapping.serde.MappingFormat; 8import cuchaz.enigma.translation.mapping.serde.MappingFormat;
9 9
10import javax.swing.*; 10import javax.swing.*;
11import java.awt.*;
11import java.awt.event.InputEvent; 12import java.awt.event.InputEvent;
12import java.awt.event.KeyEvent; 13import java.awt.event.KeyEvent;
13import java.io.File; 14import java.io.File;
14import java.io.IOException; 15import java.io.IOException;
16import java.net.MalformedURLException;
17import java.net.URISyntaxException;
18import java.net.URL;
15import java.util.jar.JarFile; 19import java.util.jar.JarFile;
16 20
17public class MenuBar extends JMenuBar { 21public class MenuBar extends JMenuBar {
@@ -213,6 +217,16 @@ public class MenuBar extends JMenuBar {
213 menu.add(item); 217 menu.add(item);
214 item.addActionListener(event -> AboutDialog.show(this.gui.getFrame())); 218 item.addActionListener(event -> AboutDialog.show(this.gui.getFrame()));
215 } 219 }
220 {
221 JMenuItem item = new JMenuItem("GitHub Page");
222 menu.add(item);
223 item.addActionListener(event -> {
224 try {
225 Desktop.getDesktop().browse(new URL("https://github.com/FabricMC/Enigma").toURI());
226 } catch (URISyntaxException | IOException ignored) {
227 }
228 });
229 }
216 } 230 }
217 } 231 }
218} 232}