From 5498b6473a6f5ce925c349f88ff3b2540afa54ce Mon Sep 17 00:00:00 2001 From: Seth Date: Sun, 18 Mar 2018 11:26:54 -0500 Subject: [PATCH] hiscore panel: make hiscores type more visible before the icon would add a 1px border to the image which made it hard to determine which one was currently active. --- .../client/plugins/hiscore/HiscorePanel.java | 36 +++++++++++++++--- .../plugins/hiscore/deadman_selected.png | Bin 505 -> 0 bytes .../hiscore/hardcore_ironman_selected.png | Bin 325 -> 0 bytes .../plugins/hiscore/ironman_selected.png | Bin 331 -> 0 bytes .../plugins/hiscore/normal_selected.png | Bin 448 -> 0 bytes .../hiscore/seasonal_deadman_selected.png | Bin 373 -> 0 bytes .../hiscore/ultimate_ironman_selected.png | Bin 433 -> 0 bytes 7 files changed, 30 insertions(+), 6 deletions(-) delete mode 100644 runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/deadman_selected.png delete mode 100644 runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/hardcore_ironman_selected.png delete mode 100644 runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/ironman_selected.png delete mode 100644 runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/normal_selected.png delete mode 100644 runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/seasonal_deadman_selected.png delete mode 100644 runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/ultimate_ironman_selected.png diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java index 5f9133e9fa..79b792fc9a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java @@ -24,6 +24,7 @@ */ package net.runelite.client.plugins.hiscore; +import java.awt.event.MouseAdapter; import static net.runelite.http.api.hiscore.HiscoreSkill.*; import com.google.common.base.Strings; import java.awt.BorderLayout; @@ -94,6 +95,8 @@ public class HiscorePanel extends PluginPanel private final ButtonGroup endpointButtonGroup = new ButtonGroup(); private final JTextArea details = new JTextArea(); + private List endpointButtons; + private final HiscoreClient client = new HiscoreClient(); private HiscoreResult result; @@ -217,30 +220,33 @@ public class HiscorePanel extends PluginPanel JPanel endpointPanel = new JPanel(); endpointPanel.setBorder(subPanelBorder); - List endpointButtons = new ArrayList<>(); - + endpointButtons = new ArrayList<>(); for (HiscoreEndpoint endpoint : HiscoreEndpoint.values()) { try { BufferedImage iconImage; - BufferedImage selectedImage; synchronized (ImageIO.class) { iconImage = ImageIO.read(HiscorePanel.class.getResourceAsStream( endpoint.name().toLowerCase() + ".png")); - selectedImage = ImageIO.read(HiscorePanel.class.getResourceAsStream( - endpoint.name().toLowerCase() + "_selected.png")); } JToggleButton button = new JToggleButton(); button.setIcon(new ImageIcon(iconImage)); - button.setSelectedIcon(new ImageIcon(selectedImage)); button.setPreferredSize(new Dimension(24, 24)); button.setBackground(Color.WHITE); button.setFocusPainted(false); button.setActionCommand(endpoint.name()); button.setToolTipText(endpoint.getName() + " Hiscores"); button.addActionListener((e -> executor.execute(this::lookup))); + button.addMouseListener(new MouseAdapter() + { + @Override + public void mouseReleased(MouseEvent e) + { + updateButtons(); + } + }); endpointButtons.add(button); endpointButtonGroup.add(button); endpointPanel.add(button); @@ -252,6 +258,7 @@ public class HiscorePanel extends PluginPanel } endpointButtons.get(0).setSelected(true); + endpointButtons.get(0).setBackground(Color.CYAN); c.gridx = 0; c.gridy = 5; @@ -457,4 +464,21 @@ public class HiscorePanel extends PluginPanel { return lookup.replace('\u00A0', ' '); } + + private void updateButtons() + { + for (JToggleButton button : endpointButtons) + { + Color color; + if (button.isSelected()) + { + color = Color.CYAN; + } + else + { + color = Color.WHITE; + } + button.setBackground(color); + } + } } diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/deadman_selected.png b/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/deadman_selected.png deleted file mode 100644 index bca0e8dc5563486a4aff37c1b8c039b2ea631098..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 505 zcmVj1UgMDN1M|?dL+KPKSZ`l1Vym z-u&L5uOqO+yns~qbytXGu|?%u%$MZ_oB_bYkqrQ#2Clne4L|}QRaVY~7m!ZbX7Bli zlgWhR@t9#4G7Lk0JY8{jbDeWw5kO&{97fRB>n&%q8K=`J<2Ys%MU0||aU8Sv(vqM8 z084_38i)X3SpviNdmNse=MGyJr?CFUl&W_YhP$`5!G6c5Q?}`pZ6-;=BuTRU_uCzv zvQ1rx97KXtOVc#B$ln+lpHs~X$j9SS1|4+U0DzrJ6+%&5`T;=3djVN@g@9f~zvE}^ zseaX``@Mk7&86S*7ht9YaxZ;eKw7fYTBEs8ey!2Opxefv+s@9_7}Y2A>C4{z%QK@W z^76s;DE|YR-jxd5sZ_HnOc440gs$4>aAZ_Tswi!LyOcqfs-~)={$IK%s%n;+Q6Hkr vR(FMv?U+O{wr1*o)f}_d^e2LUnjZfHqIIp2<v$^m9InLq#K=hrmaDl7M#bvn`TyO4_q1m4e_5pYF9 zcSrl7^n+;}KE^x?q?>pR0uKxDG;1*G+=yAc;{{_(qtX<+=?hu}^(qc?+?-I%>7`M` zp7cZl1Z1Y!ICUDb0fAf2#@0LrW@hHY%kAp}e!OTieCQ?qgJ)q?g7R{6H78BU+1dO4 z{5`!vHAt#HVZL|3p;b2%PbxoJBp-gso$bWBAK(7VJKyMfzJs^P)o@pM%`|&g!xlTu z*#Qv=#hhX57goPMeSd$!w)3BsYa}-DNp$KS`JfsBvX|l2@|<}++S|lHq2cN3=d#Wz Gp$P!07IGs1 diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/ironman_selected.png b/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/ironman_selected.png deleted file mode 100644 index 56acded1bafae6d729c6b99ff532bb41c84899f9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|wj^(N7a$D;Kb?2i11Zh|kH}&M z25w;xW@MN(M*=AL+SA1`#NzbYDI58k3`AV>IqyGNQkax{zN!EEbqi!nI3M4iow z&$z$vq{}}YQxikYA4gk?-B diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/normal_selected.png b/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/normal_selected.png deleted file mode 100644 index fbee92c847d4b9e847b5d7d71131bf2a198f141d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 448 zcmV;x0YCnUP)c)2$lG5m%HbA zpZnc=f(>OmQZBD+mJsXC709WE^}yHjd)|?JgMXLpNLivIOLU~EyvWA+n_RupRtW?q zx}G0W-Q+AVQ56HdtkCODIX(Uj7C=p42~3K+Ws1cJwyGFtn!pPDBZCkZaG8A{;`@KP)eY(j{zyzeLNuFC0*{AEdCFyDs+bI#z#sj;wM4?&7LlgHrt8$%93(@de7x>FG zt*(v>wBYCHRh~kjA$si6BG$(l48B4@D>N-%KuZ^f{0|uDSY`0l)N+*1cah5L;?l-J z>*4BHXwvQy`Js?b7+%r03L;0x*iIkZb5i3lZu#noXh02yf$Od`2vlRMnwHtlL92L} zzo28!%m4v^<&Wx?GC&V=%-MMNM1zby^Vl;3&=bX_=J7Ah5yg@u@Apu8mpcCq)xY1m T?OK)g00000NkvXXu0mjfXJ(!R diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/ultimate_ironman_selected.png b/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/ultimate_ironman_selected.png deleted file mode 100644 index d171215c16a221bdf0b2928eaa1034268572a118..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 433 zcmV;i0Z#sjP)ox@+TPLO9B7Ygp+pV-k{f!L z_sQ@5S3!w}zA^kj{jLxI)w1ATd%;p``zFJXBuP+8p_Bq(99`P?stb9zT5+V579ztC zU;|QA)rCkY0dkNeNdR(yZLkV^l1;>9jA;?uo_&>Yc}R z*E;pL{Pd=7;`A=-PzL$`$#ypxfLeMQ>#NL75Cmz^U|sB?Z%me!+o582=BIZ%9f`mE b#J1@hV%ht|^SO#p00000NkvXXu0mjf!eqQR