From a51b8b1ac764a9c0ec0a0d8774e3eb67a6d37686 Mon Sep 17 00:00:00 2001 From: Jordan Atwood Date: Wed, 22 Aug 2018 09:26:16 -0700 Subject: [PATCH] screenmarker plugin: Remove extra images This also makes the hover effect more consistent on the opacity toggle. Closes runelite/runelite#5026 --- .../screenmarkers/ui/ScreenMarkerPanel.java | 28 ++++++++++-------- .../screenmarkers/no_border_color_icon.png | Bin 15080 -> 0 bytes .../screenmarkers/no_fill_color_icon.png | Bin 15125 -> 0 bytes 3 files changed, 16 insertions(+), 12 deletions(-) delete mode 100644 runelite-client/src/main/resources/net/runelite/client/plugins/screenmarkers/no_border_color_icon.png delete mode 100644 runelite-client/src/main/resources/net/runelite/client/plugins/screenmarkers/no_fill_color_icon.png diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ui/ScreenMarkerPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ui/ScreenMarkerPanel.java index 053fb57613..5d65c95946 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ui/ScreenMarkerPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ui/ScreenMarkerPanel.java @@ -74,8 +74,9 @@ class ScreenMarkerPanel extends JPanel private static final ImageIcon NO_FILL_COLOR_HOVER_ICON; private static final ImageIcon FULL_OPACITY_ICON; - private static final ImageIcon OPACITY_HOVER_ICON; + private static final ImageIcon FULL_OPACITY_HOVER_ICON; private static final ImageIcon NO_OPACITY_ICON; + private static final ImageIcon NO_OPACITY_HOVER_ICON; private static final ImageIcon VISIBLE_ICON; private static final ImageIcon VISIBLE_HOVER_ICON; @@ -107,25 +108,28 @@ class ScreenMarkerPanel extends JPanel static { final BufferedImage borderImg = ImageUtil.getResourceStreamFromClass(ScreenMarkerPlugin.class, "border_color_icon.png"); + final BufferedImage borderImgHover = ImageUtil.grayscaleOffset(borderImg, -150); BORDER_COLOR_ICON = new ImageIcon(borderImg); - BORDER_COLOR_HOVER_ICON = new ImageIcon(ImageUtil.alphaOffset(borderImg, -100)); + BORDER_COLOR_HOVER_ICON = new ImageIcon(borderImgHover); - final BufferedImage noBorderImg = ImageUtil.getResourceStreamFromClass(ScreenMarkerPlugin.class, "no_border_color_icon.png"); - NO_BORDER_COLOR_ICON = new ImageIcon(noBorderImg); - NO_BORDER_COLOR_HOVER_ICON = new ImageIcon(ImageUtil.alphaOffset(noBorderImg, -100)); + NO_BORDER_COLOR_ICON = new ImageIcon(borderImgHover); + NO_BORDER_COLOR_HOVER_ICON = new ImageIcon(ImageUtil.alphaOffset(borderImgHover, -100)); final BufferedImage fillImg = ImageUtil.getResourceStreamFromClass(ScreenMarkerPlugin.class, "fill_color_icon.png"); + final BufferedImage fillImgHover = ImageUtil.grayscaleOffset(fillImg, -150); FILL_COLOR_ICON = new ImageIcon(fillImg); - FILL_COLOR_HOVER_ICON = new ImageIcon(ImageUtil.alphaOffset(fillImg, -100)); + FILL_COLOR_HOVER_ICON = new ImageIcon(fillImgHover); - final BufferedImage noFillImg = ImageUtil.getResourceStreamFromClass(ScreenMarkerPlugin.class, "no_fill_color_icon.png"); - NO_FILL_COLOR_ICON = new ImageIcon(noFillImg); - NO_FILL_COLOR_HOVER_ICON = new ImageIcon(ImageUtil.alphaOffset(noFillImg, -100)); + NO_FILL_COLOR_ICON = new ImageIcon(fillImgHover); + NO_FILL_COLOR_HOVER_ICON = new ImageIcon(ImageUtil.alphaOffset(fillImgHover, -100)); final BufferedImage opacityImg = ImageUtil.getResourceStreamFromClass(ScreenMarkerPlugin.class, "opacity_icon.png"); + final BufferedImage opacityImgHover = ImageUtil.grayscaleOffset(opacityImg, -150); FULL_OPACITY_ICON = new ImageIcon(opacityImg); - OPACITY_HOVER_ICON = new ImageIcon(ImageUtil.alphaOffset(opacityImg, -100)); - NO_OPACITY_ICON = new ImageIcon(ImageUtil.alphaOffset(opacityImg, -150)); + FULL_OPACITY_HOVER_ICON = new ImageIcon(opacityImgHover); + + NO_OPACITY_ICON = new ImageIcon(opacityImgHover); + NO_OPACITY_HOVER_ICON = new ImageIcon(ImageUtil.alphaOffset(opacityImgHover, -100)); final BufferedImage visibleImg = ImageUtil.getResourceStreamFromClass(ScreenMarkerPlugin.class, "visible_icon.png"); VISIBLE_ICON = new ImageIcon(visibleImg); @@ -331,7 +335,7 @@ class ScreenMarkerPanel extends JPanel @Override public void mouseEntered(MouseEvent mouseEvent) { - opacityIndicator.setIcon(OPACITY_HOVER_ICON); + opacityIndicator.setIcon(marker.getMarker().getFill().getAlpha() == 0 ? NO_OPACITY_HOVER_ICON : FULL_OPACITY_HOVER_ICON); } @Override diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/screenmarkers/no_border_color_icon.png b/runelite-client/src/main/resources/net/runelite/client/plugins/screenmarkers/no_border_color_icon.png deleted file mode 100644 index deeebaf3f7ebd76f6e4bbb42fba39403b5b0b782..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15080 zcmeI3U5MON6vxvlQnxHDmSXimV^+~pGx?awe1w@P>&&jR(pi_?mClNYH_4sd(3vDn zvOBX2g02f{Db}hWem#gj_@p5CR8Yi<`Xb^>t@@(&K~WI)StzDGYdI+bOQVfG&g zK6{u~Uq8e!x!=sCnqR9PQ+2zU0EVr>M7!yr*$k6E+IE0`0{W~5S4^wG{eJEvjx~(} zcU-B8Ri^}3&B~?=7dPjY^vx4`&fty~$MS6z1!zJau0{G zDuug>z2~@T8FtG%oELDH{(ASL!7}h+5$(q;FDhs=E=f66%Brd45m8b_F%~46iN&be zhFRYj5<^y0NsPyc&BSA%`Z0hHb`>Q)Hx|dx)w=CAfnPM6U%Jlg*#21wLBkKI-D&R(Llm94KbrimTSvf781yWAo6{w|oNrG7(q?HV>1KCg% zT{pyJvYRLtY#`Btu8H~{XvF3O_hO)Anw9~nw36i&14_JTq;kBbfjY0~DNz#@IjhOJ zZi*pc22xc_5AD{C*e*tUIqYnU@Z`?XuFx>U4&?yXgF*cjxNZUVT3WAT1wLUNt3VHW zTTu_n0~&c@$7uhudY&COb8tC#haid{b03|fwF)g#c}1bZS)+q^cHM6Q7f!999kQFs zkD~5$!^7u=;J=_@{s#-;f%U6fhTT=w)h)x04)y;nLw^_RtH4@;Mp5W);O@ZgRxVo4 zot4$C*1<~52Y*f~s$#UGKv+Gf2@Z_)Ge`4lK{Ynk!uc6lM28>+-yPSujJqzAUE?zD z+V_0OGX0|5$%YNbyn=twsJ$=iiXQsV^QO>y;2bE=UKhKTC;dCRmQk@-GzkWTY*JigKA1{z zVL-?x#YN_WsT3Cmgltk=WImWmabZBnCdEbOgQ*l3283)cTb^2K zfBW{=Z;o%zPi+6tyl!JVF>&GJ_r5x`Rr>Mp3pZ5W`ANz?H+k;N#QRqcBwti6{(bRC z`IBR3r(e4B`~wHM59Q76+TQcqhm6zDd^vr3-yNH`eDK;YEceIB@80-)=GVE2vjqqV4;XDB8Wnv2yHw{JL(CSO21u6JaQ0kePTxL&_!$K>* zoIo!B`Op9VbH4wQd6^UA`<`Dr_~anNFl%#T*$MQ$-hB_OMxTFQ+&X4Qli+MOOuHWcKb3LU^Usujal8mW-yS3$qsWj@4u zTb$WcXv7W37W3n5#N{!q z$wFJT^qQla2J89-C3DV6g+gwi_N#fWYONi}u$$}Z(6%#r1R-c5?P+Nj=4+6j zfVMejsc`fNI?C2wr+4&nCppVJxthM$4jXzOGgsrAd8OcID2dLhWGo0A(<+!|CGA() zcncw$$#_-8ZlBZ*&8*wcCVAYXlkbiE-zzKBSl;%0VB2owyIwKN@hrio68(2K;EMQZ}tBaMF4eOhdkAOeguyVqj;x zs+5dbF)egiFfAteUdsV1uhNv9VLQN3VJ@3S3t?T?6e!1lD3)YSOGqkLmZHNPP_+nG zPQ=xO1VuSf@*(E)LGv!xSyP>Jy9K%S2a9H^$bILsN}{A`2_SJYEX6ocgeXuMF{)*6vK@qnm#?-I72TUqHDKA$?Y~s0)qw4h)}C0djn~Ht zP~F*vA*PeUf+o3o815kO&(bxxX~5tgG%X4a+9f|CfeN6{|DAn1))KZxwKBVP%=~ z^SQjUS_7fG6O-Vor!L$??281k9Tx33&mg2&IkVT4% z%m>p_To@3tNO6(*U|Na`140%lE;1iXOL1X9$Rfo>=7VV|E({1+B;p$EJi-YL^xS40 zJ)l`UJg%XKJ6UyXBF``j+Zg7RR~hE+J@kE(VI~HcRgV`LMmfbW8_b_y+Hw-@{WzB$ zDKvil=Z&=v1V|LBu(&Db0+bZ8?vX@e;-#PU3>PJrgvom!1 zcK9{+r|&OBgx#~}?tGCuzVVr_e!uzVl{2T#U4O59^vlma&7Ixy%k`zpOOJ+6T)nY$ zNz=qzmo^^|?>*+68TfH%^v=M6clW&h*2`BH*BoCw``ZuJ@P|*W-?-ts#I?m+LmT<* r(5Cm-@4tI=)4Gd)oWE}VwVByo7~S*H