From ae5cb7a17a0d68072f98489b658444eb34c3ced8 Mon Sep 17 00:00:00 2001 From: drdev Date: Fri, 15 Nov 2013 09:40:47 +0000 Subject: [PATCH] Make ability menu items consistent regardless of containing mana symbol icons and make them respect menu item height --- forge-gui/src/main/java/forge/gui/GuiUtils.java | 5 ++++- forge-gui/src/main/java/forge/gui/toolbox/FSkin.java | 8 ++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/forge-gui/src/main/java/forge/gui/GuiUtils.java b/forge-gui/src/main/java/forge/gui/GuiUtils.java index 55b198afc98..6fee89934f8 100644 --- a/forge-gui/src/main/java/forge/gui/GuiUtils.java +++ b/forge-gui/src/main/java/forge/gui/GuiUtils.java @@ -109,7 +109,10 @@ public final class GuiUtils { } public static JMenuItem createMenuItem(String label, KeyStroke accelerator, final Runnable onClick, boolean enabled, boolean bold) { - JMenuItem item = new JMenuItem(label); + if (label.startsWith("")) { //adjust label if HTML + label = "" + "
" + label.substring(6, label.length() - 7) + "
"; + } + JMenuItem item = new JMenuItem(label); item.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent arg0) { diff --git a/forge-gui/src/main/java/forge/gui/toolbox/FSkin.java b/forge-gui/src/main/java/forge/gui/toolbox/FSkin.java index 913b4d8ca8b..fa3a161a3d8 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/FSkin.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/FSkin.java @@ -1657,15 +1657,11 @@ public enum FSkin { String replacement; try { replacement = ""; + str = str.replaceAll(pattern, replacement); } catch (MalformedURLException e) { e.printStackTrace(); - return str; } - String encodedStr = str.replaceAll(pattern, replacement); - if (encodedStr.length() != str.length()) { - encodedStr = "" + encodedStr + ""; //need to wrap in HTML tags to ensure text rendered as HTML so symbols appear - } - return encodedStr; + return "" + str + ""; //must wrap in tag for images to appear } private static final String