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

worldhopper: change header color to yellow with active filter (#7035)

Browse Source 
Closes #7022
This commit is contained in:
Jake Wilson
2019-01-04 00:32:58 -05:00
committed by Tomas Slusny
parent 88cbd32a46
commit 1af2dac241
2 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldTableHeader.java
View File

@@ -45,18 +45,24 @@ import net.runelite.client.util.ImageUtil;
class WorldTableHeader extends JPanel class WorldTableHeader extends JPanel
{ {
private static final ImageIcon ARROW_DOWN;
private static final ImageIcon ARROW_UP; private static final ImageIcon ARROW_UP;
private static final ImageIcon ARROW_UP_FADED; private static final ImageIcon HIGHLIGHT_ARROW_DOWN;
private static final ImageIcon HIGHLIGHT_ARROW_UP;
private static final Color ARROW_COLOR = ColorScheme.LIGHT_GRAY_COLOR;
private static final Color HIGHLIGHT_COLOR = ColorScheme.BRAND_ORANGE;
static static
{ {
final BufferedImage arrowDown = ImageUtil.getResourceStreamFromClass(WorldHopperPlugin.class, "arrow_down.png"); final BufferedImage arrowDown = ImageUtil.getResourceStreamFromClass(WorldHopperPlugin.class, "arrow_down.png");
final BufferedImage arrowUp = ImageUtil.rotateImage(arrowDown, Math.PI); final BufferedImage arrowUp = ImageUtil.rotateImage(arrowDown, Math.PI);
final BufferedImage arrowUpFaded = ImageUtil.grayscaleOffset(arrowUp, -80); final BufferedImage arrowUpFaded = ImageUtil.grayscaleOffset(arrowUp, -80);
ARROW_DOWN = new ImageIcon(arrowDown); ARROW_UP = new ImageIcon(arrowUpFaded);
ARROW_UP = new ImageIcon(arrowUp);
ARROW_UP_FADED = new ImageIcon(arrowUpFaded); final BufferedImage highlightArrowDown = ImageUtil.fillImage(arrowDown, HIGHLIGHT_COLOR);
final BufferedImage highlightArrowUp = ImageUtil.fillImage(arrowUp, HIGHLIGHT_COLOR);
HIGHLIGHT_ARROW_DOWN = new ImageIcon(highlightArrowDown);
HIGHLIGHT_ARROW_UP = new ImageIcon(highlightArrowUp);
} }
private final JLabel textLabel = new JLabel(); private final JLabel textLabel = new JLabel();
@@ -77,19 +83,21 @@ class WorldTableHeader extends JPanel
@Override @Override
public void mouseEntered(MouseEvent mouseEvent) public void mouseEntered(MouseEvent mouseEvent)
{ {
textLabel.setForeground(Color.WHITE); textLabel.setForeground(HIGHLIGHT_COLOR);
if (!ordering)
{
arrowLabel.setIcon(HIGHLIGHT_ARROW_UP);
}
} }
@Override @Override
public void mouseExited(MouseEvent mouseEvent) public void mouseExited(MouseEvent mouseEvent)
{ {
if (ordering) if (!ordering)
{ {
textLabel.setForeground(Color.WHITE); textLabel.setForeground(ARROW_COLOR);
return; arrowLabel.setIcon(ARROW_UP);
} }
textLabel.setForeground(ColorScheme.LIGHT_GRAY_COLOR);
} }
}); });
@@ -133,7 +141,8 @@ class WorldTableHeader extends JPanel
public void highlight(boolean on, boolean ascending) public void highlight(boolean on, boolean ascending)
{ {
ordering = on; ordering = on;
arrowLabel.setIcon(on ? (ascending ? ARROW_DOWN : ARROW_UP) : ARROW_UP_FADED); arrowLabel.setIcon(on ? (ascending ? HIGHLIGHT_ARROW_DOWN : HIGHLIGHT_ARROW_UP) : ARROW_UP);
textLabel.setForeground(on ? Color.WHITE : ColorScheme.LIGHT_GRAY_COLOR); textLabel.setForeground(on ? HIGHLIGHT_COLOR : ARROW_COLOR);
} }
} }

2
runelite-client/src/main/java/net/runelite/client/util/ImageUtil.java
View File

@@ -361,7 +361,7 @@ public class ImageUtil
* @param color The color with which to fill pixels. * @param color The color with which to fill pixels.
* @return The given image with all non-transparent pixels set to the given color. * @return The given image with all non-transparent pixels set to the given color.
*/ */
static BufferedImage fillImage(final BufferedImage image, final Color color) public static BufferedImage fillImage(final BufferedImage image, final Color color)
{ {
return fillImage(image, color, ColorUtil::isNotFullyTransparent); return fillImage(image, color, ColorUtil::isNotFullyTransparent);
} }