ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #992 from Abextm/xp-panel-ui

Browse Source 
Make XP panel easier to read
This commit is contained in:
Adam
2018-03-19 17:12:02 -04:00
committed by GitHub
parent 50932177ed 5a5b01a726
commit 0fcb362f0e
3 changed files with 115 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,16 +52,13 @@ import lombok.Getter;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import net.runelite.api.Client; import net.runelite.api.Client;
import net.runelite.client.game.SkillIconManager; import net.runelite.client.game.SkillIconManager;
import net.runelite.client.ui.JShadowedLabel;
import org.pushingpixels.substance.internal.SubstanceSynapse; import org.pushingpixels.substance.internal.SubstanceSynapse;
@Slf4j @Slf4j
class XpInfoBox extends JPanel class XpInfoBox extends JPanel
{ {
private static final Rectangle ICON_BOUNDS = new Rectangle(0, 0, 26, 26); 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
};
private final Client client; private final Client client;
private final JPanel panel; private final JPanel panel;
@@ -78,7 +75,7 @@ class XpInfoBox extends JPanel
private final JLabel xpGained = new JLabel(); private final JLabel xpGained = new JLabel();
private final JLabel xpLeft = new JLabel(); private final JLabel xpLeft = new JLabel();
private final JLabel actionsLeft = new JLabel(); private final JLabel actionsLeft = new JLabel();
private final JLabel levelLabel = new JLabel(); private final JLabel levelLabel = new JShadowedLabel();
private final JButton skillIcon = new JButton(); private final JButton skillIcon = new JButton();
XpInfoBox(Client client, JPanel panel, SkillXPInfo xpInfo, SkillIconManager iconManager) throws IOException XpInfoBox(Client client, JPanel panel, SkillXPInfo xpInfo, SkillIconManager iconManager) throws IOException
@@ -137,6 +134,7 @@ class XpInfoBox extends JPanel
// Create level label // Create level label
levelLabel.setHorizontalAlignment(JLabel.CENTER); levelLabel.setHorizontalAlignment(JLabel.CENTER);
levelLabel.setForeground(Color.YELLOW);
levelLabel.setBounds(ICON_BOUNDS); levelLabel.setBounds(ICON_BOUNDS);
levelLabel.setOpaque(false); levelLabel.setOpaque(false);
@@ -232,7 +230,7 @@ class XpInfoBox extends JPanel
final int progress = xpInfo.getSkillProgress(); final int progress = xpInfo.getSkillProgress();
progressBar.setValue(progress); progressBar.setValue(progress);
progressBar.setBackground(interpolateColors(PROGRESS_COLORS, (double) progress / 100d)); progressBar.setBackground(Color.getHSBColor((progress / 100.f) * (120.f / 360.f), 1, 1));
progressBar.setToolTipText("<html>" progressBar.setToolTipText("<html>"
+ XpPanel.formatLine(xpInfo.getActions(), "actions") + XpPanel.formatLine(xpInfo.getActions(), "actions")
@@ -248,46 +246,6 @@ class XpInfoBox extends JPanel
}); });
} }
/**
* Interpolate between array of colors using Normal (Gaussian)
* distribution
*
* @see
* <a href="https://en.wikipedia.org/wiki/Normal_distribution}">Normal
* distribution on Wikipedia</a>
* @param colors array of colors
* @param x distribution factor
* @return interpolated color
*/
private static Color interpolateColors(Color[] colors, double x)
{
double r = 0.0, g = 0.0, b = 0.0;
double total = 0.0;
double step = 1.0 / (double) (colors.length - 1);
double mu = 0.0;
double sigma2 = 0.035;
for (Color ignored : colors)
{
total += Math.exp(-(x - mu) * (x - mu) / (2.0 * sigma2)) / Math.sqrt(2.0 * Math.PI * sigma2);
mu += step;
}
mu = 0.0;
for (Color color : colors)
{
double percent = Math.exp(-(x - mu) * (x - mu) / (2.0 * sigma2)) / Math.sqrt(2.0 * Math.PI * sigma2);
mu += step;
r += color.getRed() * percent / total;
g += color.getGreen() * percent / total;
b += color.getBlue() * percent / total;
}
return new Color((int) r, (int) g, (int) b);
}
private static BufferedImage createHoverImage(BufferedImage image) private static BufferedImage createHoverImage(BufferedImage image)
{ {
LookupTable lookup = new LookupTable(0, 4) LookupTable lookup = new LookupTable(0, 4)

64
runelite-client/src/main/java/net/runelite/client/ui/JShadowedLabel.java Normal file
View File

@@ -0,0 +1,64 @@
/*
* Copyright (c) 2018 Abex
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package net.runelite.client.ui;
import java.awt.Color;
import java.awt.Point;
import javax.swing.JLabel;
import lombok.Getter;
public class JShadowedLabel extends JLabel
{
public JShadowedLabel()
{
super();
setUI(new JShadowedLabelUI());
}
public JShadowedLabel(String str)
{
super(str);
setUI(new JShadowedLabelUI());
}
@Getter
private Color shadow = Color.BLACK;
public void setShadow(Color shadow)
{
this.shadow = shadow;
repaint();
}
@Getter
private Point shadowSize = new Point(1, 1);
public void setShadowSize(Point newSize)
{
this.shadowSize = newSize;
revalidate();
repaint();
}
}

47
runelite-client/src/main/java/net/runelite/client/ui/JShadowedLabelUI.java Normal file
View File

@@ -0,0 +1,47 @@
/*
* Copyright (c) 2018 Abex
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package net.runelite.client.ui;
import java.awt.Graphics;
import javax.swing.JLabel;
import javax.swing.plaf.basic.BasicLabelUI;
class JShadowedLabelUI extends BasicLabelUI
{
@Override
protected void paintEnabledText(JLabel l, Graphics g, String s, int textX, int textY)
{
if (l instanceof JShadowedLabel)
{
JShadowedLabel ll = (JShadowedLabel) l;
g.setColor(ll.getShadow());
g.drawString(s, textX + ll.getShadowSize().x, textY + ll.getShadowSize().y);
}
g.setColor(l.getForeground());
g.drawString(s, textX, textY);
}
// The default impl of paintDisabledText is OK
}