Merge pull request #507 from sethtroll/fixupxptracker

Update Xp tracker UI to make it smaller

runelite-client/src/main/java/net/runelite/client/plugins/xptracker/SkillXPInfo.java

@@ -43,6 +43,7 @@ class SkillXPInfo
 	private int actionExp = 0;
 	private int nextLevelExp = 0;
 	private int startLevelExp = 0;
+	private int level = 0;
 
 	int getXpHr()
 	{
@@ -116,6 +117,9 @@ class SkillXPInfo
 		startLevelExp = Experience.getXpForLevel(Experience.getLevelForXp(currentXp));
 
 		int currentLevel = Experience.getLevelForXp(currentXp);
+
+		level = currentLevel;
+
 		nextLevelExp = currentLevel + 1 <= Experience.MAX_VIRT_LEVEL ? Experience.getXpForLevel(currentLevel + 1) : -1;
 
 		if (skillTimeStart == null)

runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpInfoBox.java

@@ -26,26 +26,38 @@ package net.runelite.client.plugins.xptracker;
 
 import java.awt.BorderLayout;
 import java.awt.Color;
-import java.awt.Dimension;
 import java.awt.GridLayout;
+import java.awt.Rectangle;
+import java.awt.RenderingHints;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.awt.image.BufferedImage;
+import java.awt.image.LookupOp;
+import java.awt.image.LookupTable;
 import java.io.IOException;
-import javax.swing.BorderFactory;
 import javax.swing.ImageIcon;
 import javax.swing.JButton;
 import javax.swing.JLabel;
+import javax.swing.JLayeredPane;
 import javax.swing.JPanel;
 import javax.swing.JProgressBar;
+import javax.swing.SwingConstants;
 import javax.swing.SwingUtilities;
+import javax.swing.border.CompoundBorder;
+import javax.swing.border.EmptyBorder;
+import javax.swing.border.LineBorder;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.Client;
 import net.runelite.client.game.SkillIconManager;
+import org.pushingpixels.substance.internal.SubstanceSynapse;
 
 @Slf4j
 class XpInfoBox extends JPanel
 {
-
+	private static final Rectangle ICON_BOUNDS = new Rectangle(0, 0, 26, 26);
 	private static final Color[] PROGRESS_COLORS = new Color[]
 	{
 		Color.RED, Color.YELLOW, Color.GREEN
@@ -56,11 +68,18 @@ class XpInfoBox extends JPanel
 	@Getter(AccessLevel.PACKAGE)
 	private final SkillXPInfo xpInfo;
 
+	private final JPanel container = new JPanel();
+
+	private final JPanel iconBarPanel = new JPanel();
+	private final JPanel statsPanel = new JPanel();
+
 	private final JProgressBar progressBar = new JProgressBar();
 	private final JLabel xpHr = new JLabel();
 	private final JLabel xpGained = new JLabel();
-	private final JLabel actionsHr = new JLabel();
+	private final JLabel xpLeft = new JLabel();
-	private final JLabel actions = new JLabel();
+	private final JLabel actionsLeft = new JLabel();
+	private final JLabel levelLabel = new JLabel();
+	private final JButton skillIcon = new JButton();
 
 	XpInfoBox(Client client, JPanel panel, SkillXPInfo xpInfo, SkillIconManager iconManager) throws IOException
 	{
@@ -69,26 +88,64 @@ class XpInfoBox extends JPanel
 		this.xpInfo = xpInfo;
 
 		setLayout(new BorderLayout());
-		setBorder(BorderFactory.createLineBorder(getBackground().brighter(), 1, true));
+		setBorder(new CompoundBorder
+		(
+			new EmptyBorder(2, 0, 2, 0),
+			new LineBorder(getBackground().brighter(), 1)
+		));
 
-		final JPanel container = new JPanel();
+		// Expand stats panel on click
-		container.setBorder(BorderFactory.createEmptyBorder(3, 3, 3, 3));
+		Color backgroundColor = getBackground();
-		container.setLayout(new BorderLayout(3, 3));
+
+		MouseListener panelMouseListener = new MouseAdapter()
+		{
+			@Override
+			public void mouseEntered(MouseEvent e)
+			{
+				container.setBackground(backgroundColor.darker().darker());
+			}
+			@Override
+			public void mouseExited(MouseEvent e)
+			{
+				container.setBackground(backgroundColor);
+			}
+			@Override
+			public void mouseReleased(MouseEvent e)
+			{
+				showStatsPanel();
+			}
+		};
+
+		container.setLayout(new BorderLayout());
+		container.setBorder(new EmptyBorder(5, 5, 5, 5));
+		container.addMouseListener(panelMouseListener);
+
+		iconBarPanel.setLayout(new BorderLayout(5, 0));
+		iconBarPanel.setOpaque(false);
 
 		// Create skill/reset icon
-		final JButton resetIcon = new JButton(new ImageIcon(iconManager.getSkillImage(xpInfo.getSkill())));
+		final BufferedImage skillImage = iconManager.getSkillImage(xpInfo.getSkill());
-		resetIcon.setToolTipText("Reset " + xpInfo.getSkill().getName() + " tracker");
+		skillIcon.putClientProperty(SubstanceSynapse.FLAT_LOOK, Boolean.TRUE);
-		resetIcon.setPreferredSize(new Dimension(64, 64));
+		skillIcon.putClientProperty(SubstanceSynapse.BUTTON_NEVER_PAINT_BACKGROUND, Boolean.TRUE);
-		resetIcon.addActionListener(e -> reset());
+		skillIcon.setIcon(new ImageIcon(skillImage));
+		skillIcon.setRolloverIcon(new ImageIcon(createHoverImage(skillImage)));
+		skillIcon.setToolTipText("Reset " + xpInfo.getSkill().getName() + " tracker");
+		skillIcon.addActionListener(e -> reset());
+		skillIcon.setBounds(ICON_BOUNDS);
+		skillIcon.setOpaque(false);
+		skillIcon.setFocusPainted(false);
 
-		// Create info panel
+		// Create level label
-		final JPanel rightPanel = new JPanel();
+		levelLabel.setHorizontalAlignment(JLabel.CENTER);
-		rightPanel.setLayout(new GridLayout(4, 1));
+		levelLabel.setBounds(ICON_BOUNDS);
-		rightPanel.setBorder(BorderFactory.createEmptyBorder(3, 0, 3, 0));
+		levelLabel.setOpaque(false);
-		rightPanel.add(xpHr);
+
-		rightPanel.add(xpGained);
+		// Create pane for grouping skill icon and level label
-		rightPanel.add(actionsHr);
+		final JLayeredPane layeredPane = new JLayeredPane();
-		rightPanel.add(actions);
+		layeredPane.add(skillIcon, new Integer(1));
+		layeredPane.add(levelLabel, new Integer(2));
+		layeredPane.setPreferredSize(ICON_BOUNDS.getSize());
+		iconBarPanel.add(layeredPane, BorderLayout.LINE_START);
 
 		// Create progress bar
 		progressBar.setStringPainted(true);
@@ -96,16 +153,44 @@ class XpInfoBox extends JPanel
 		progressBar.setMinimum(0);
 		progressBar.setMaximum(100);
 		progressBar.setBackground(Color.RED);
+		progressBar.addMouseListener(panelMouseListener);
+		iconBarPanel.add(progressBar, BorderLayout.CENTER);
+
+		container.add(iconBarPanel, BorderLayout.NORTH);
+
+		// Stats panel
+		statsPanel.setLayout(new GridLayout(2, 2));
+		statsPanel.setBorder(new EmptyBorder(3, 0, 0, 0));
+		statsPanel.setOpaque(false);
+
+		statsPanel.add(xpGained);
+		xpHr.setHorizontalAlignment(SwingConstants.RIGHT);
+		statsPanel.add(xpHr);
+		statsPanel.add(xpLeft);
+		actionsLeft.setHorizontalAlignment(SwingConstants.RIGHT);
+		statsPanel.add(actionsLeft);
 
-		container.add(resetIcon, BorderLayout.LINE_START);
-		container.add(rightPanel, BorderLayout.CENTER);
-		container.add(progressBar, BorderLayout.SOUTH);
 		add(container, BorderLayout.CENTER);
 	}
 
+	private void showStatsPanel()
+	{
+		if (statsPanel.isShowing())
+		{
+			container.remove(statsPanel);
+			revalidate();
+		}
+		else
+		{
+			container.add(statsPanel, BorderLayout.SOUTH);
+			revalidate();
+		}
+	}
+
 	void reset()
 	{
 		xpInfo.reset(client.getSkillExperience(xpInfo.getSkill()));
+		container.remove(statsPanel);
 		panel.remove(this);
 		panel.revalidate();
 	}
@@ -139,8 +224,10 @@ class XpInfoBox extends JPanel
 					panel.revalidate();
 				}
 
-				xpHr.setText(XpPanel.formatLine(xpInfo.getXpGained(), "xp gained"));
+				levelLabel.setText(String.valueOf(xpInfo.getLevel()));
-				actions.setText(XpPanel.formatLine(xpInfo.getActions(), "actions"));
+				xpGained.setText(XpPanel.formatLine(xpInfo.getXpGained(), "xp gained"));
+				xpLeft.setText(XpPanel.formatLine(xpInfo.getXpRemaining(), "xp left"));
+				actionsLeft.setText(XpPanel.formatLine(xpInfo.getActionsRemaining(), "actions left"));
 
 				final int progress = xpInfo.getSkillProgress();
 
@@ -148,15 +235,14 @@ class XpInfoBox extends JPanel
 				progressBar.setBackground(interpolateColors(PROGRESS_COLORS, (double) progress / 100d));
 
 				progressBar.setToolTipText("<html>"
-					+ XpPanel.formatLine(xpInfo.getXpRemaining(), "xp remaining")
+					+ XpPanel.formatLine(xpInfo.getActions(), "actions")
 					+ "<br/>"
-					+ XpPanel.formatLine(xpInfo.getActionsRemaining(), "actions remaining")
+					+ XpPanel.formatLine(xpInfo.getActionsHr(), "actions/hr")
 					+ "</html>");
 			}
 
-			// Always update xp/hr and actions/hr as time always changes
+			// Always update xp/hr as time always changes
-			xpGained.setText(XpPanel.formatLine(xpInfo.getXpHr(), "xp/hr"));
+			xpHr.setText(XpPanel.formatLine(xpInfo.getXpHr(), "xp/hr"));
-			actionsHr.setText(XpPanel.formatLine(xpInfo.getActionsHr(), "actions/hr"));
 		});
 	}
 
@@ -199,4 +285,24 @@ class XpInfoBox extends JPanel
 
 		return new Color((int) r, (int) g, (int) b);
 	}
+
+	private static BufferedImage createHoverImage(BufferedImage image)
+	{
+		LookupTable lookup = new LookupTable(0, 4)
+		{
+			@Override
+			public int[] lookupPixel(int[] src, int[] dest)
+			{
+				if (dest[3] != 0)
+				{
+					dest[3] = 60;
+				}
+
+				return dest;
+			}
+		};
+
+		LookupOp op = new LookupOp(lookup, new RenderingHints(null));
+		return op.filter(image, null);
+	}
 }

runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpPanel.java

@@ -32,6 +32,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 import javax.swing.BorderFactory;
+import javax.swing.BoxLayout;
 import javax.swing.JButton;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
@@ -80,7 +81,7 @@ class XpPanel extends PluginPanel
 		layoutPanel.add(totalPanel, BorderLayout.NORTH);
 
 		final JPanel infoBoxPanel = new JPanel();
-		infoBoxPanel.setLayout(new GridLayout(0, 1, 0, 3));
+		infoBoxPanel.setLayout(new BoxLayout(infoBoxPanel, BoxLayout.Y_AXIS));
 		layoutPanel.add(infoBoxPanel, BorderLayout.CENTER);
 
 		try
@@ -141,6 +142,17 @@ class XpPanel extends PluginPanel
 
 	static String formatLine(double number, String description)
 	{
-		return NUMBER_FORMATTER.format(number) + " " + description;
+		String numberStr;
+		if (number < 100000)
+		{
+			numberStr = NUMBER_FORMATTER.format(number);
+		}
+		else
+		{
+			int num = (int) (Math.log(number) / Math.log(1000));
+			numberStr = String.format("%.1f%c", number / Math.pow(1000, num), "KMB".charAt(num - 1));
+		}
+
+		return numberStr + " " + description;
 	}
 }