From 7b166191589ff405d2dccdbeaadcddc82c70fbee Mon Sep 17 00:00:00 2001
From: Ben Fry <ben@fathom.info>
Date: Sun, 1 May 2022 19:07:49 -0400
Subject: [PATCH] make the close button an svg icon

---
 .../processing/app/contrib/ContributionTab.java   |   5 ++++-
 build/shared/lib/manager/close-1x.png             | Bin 337 -> 0 bytes
 build/shared/lib/manager/close-2x.png             | Bin 623 -> 0 bytes
 build/shared/lib/theme.txt                        |   3 +++
 4 files changed, 7 insertions(+), 1 deletion(-)
 delete mode 100644 build/shared/lib/manager/close-1x.png
 delete mode 100644 build/shared/lib/manager/close-2x.png

diff --git a/app/src/processing/app/contrib/ContributionTab.java b/app/src/processing/app/contrib/ContributionTab.java
index b97e9325c..84e2221ad 100644
--- a/app/src/processing/app/contrib/ContributionTab.java
+++ b/app/src/processing/app/contrib/ContributionTab.java
@@ -96,6 +96,8 @@ public class ContributionTab extends JPanel {
 
     listPanel.updateTheme();
     statusPanel.updateTheme();
+
+    closeButton.setIcon(Toolkit.renderIcon("manager/close", Theme.get("manager.error.close.icon.color"), 16));
   }
 
 
@@ -210,7 +212,8 @@ public class ContributionTab extends JPanel {
     errorMessage.setMinimumSize(dim);
     errorMessage.setOpaque(false);
 
-    closeButton = Toolkit.createIconButton("manager/close");
+//    closeButton = Toolkit.createIconButton("manager/close");
+    closeButton = new JButton();
     closeButton.setContentAreaFilled(false);
     closeButton.addActionListener(e -> managerFrame.rebuildTabLayouts(false, false));
     tryAgainButton = new JButton("Try Again");
diff --git a/build/shared/lib/manager/close-1x.png b/build/shared/lib/manager/close-1x.png
deleted file mode 100644
index 02ab4cc4e165f6b66e8744ee7faa7befd974bcaf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 337
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf<Z~8yL>4nJ
za0`PlBg3pY5<tPvo-U3d7QI_9-q&gg6k+`^f9E5{jt>Dxrk>C?@N!wKsrgYQ=uw*u
z)6!)k{)wN|^X#5I>$%zYd8YR2vbWc6WzXOH{h_=;qwSqVvmdeP_V63)s~isZwMkre
zZcoQ6{$hKrGtZxS+O#iv-SkoG$=xll%)d2POxqFmpiHP-Zbw<pg_Cj7-ha%t1?`)7
z_0CZ?`PPZE9q;SBcz?lzRrzP2fz+psP5%xT&o902TVw2V>0Fl8#)F9hdP3XZefQO4
zE*FqK^Wf}*`Tkti^B);M)t_;yJW6xMtE80$!W*R2G>>Xedwr(%%p-~Z%(-0r7KgqV
h6!*0q3>Ux1ysWgmrF+k@bwKYkc)I$ztaD0e0ssVcj*$QW

diff --git a/build/shared/lib/manager/close-2x.png b/build/shared/lib/manager/close-2x.png
deleted file mode 100644
index 3f3202da7923fbc7db108c2a8aeb8f405a8c5e1c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 623
zcmV-#0+9WQP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS00009a7bBm000XU000XU0RWnu7ytkQ5lKWrR9J=Ompy9~Q51%s#NB|M`2j&J
z(uJUvfejG^!6FHURj{$p-A!B)5DO)OOLmhOQlv;3|A(#kfr^b{{78xvl42DlYPY+B
znX#C;aCdU<ojbdeBIJeB+&S-g-km!iJ8<09ld%6RFb<3WgFt_{{u|f<-U3g6&9nk4
zT?5_&zGJ-u@@ari1J4tHqxBRR=oCIiaB4e+tJ(u{N#PfOW(sgs4Pew2eg^oHB3#uk
zf-SYG2Y7u5a8)nk0^Bed_kkj?;sALBltPbm{JJf`mcevW>#17c3tC^n(DT^@&shdf
zM|vwl&%;R1ZOgp#Qh-&9!6VoLT@SS5^O0lIp~tpO2lT>XP$8mc;y!RMvR00P`@l0P
z!1oxF3Q?BKq2?TB_&{AU|8+F`z^vfElfd6nre1A8k~iZiVXa?SGf8Cq#4UZrGPveA
z<A-E^<6x{tJf*O7EjrA3B?VZIG1UaPhkT1J#mrih0$j2fmLt7I+HW<F;K`@U_Sn8C
z1?UBK4TedruYi1?d%!KNFK?LjmG+CjO|u456Syq=aw$YH4BRsG%$VQ+8Q_xz&~1GH
zPS^qf43qA^Ayo}vC=RZa$NWC;r2YX{T;WPrG4ErNY64S9;Y#O#?JnS72)48<^#ON*
zZwbJ4f|paaTez+)FabOUKGJ@nHVHn*HV8i5GHHTsIvLi{)qjB&@qV9+c<TTF002ov
JPDHLkV1i<k4N3q2

diff --git a/build/shared/lib/theme.txt b/build/shared/lib/theme.txt
index 0d4e0d8ed..d95bcda27 100644
--- a/build/shared/lib/theme.txt
+++ b/build/shared/lib/theme.txt
@@ -205,6 +205,9 @@ manager.tab.background = #6BA0C7
 
 ## ContributionTab
 
+# error window (X) close button
+manager.error.close.icon.color = #000000
+
 manager.scrollbar.thumb.enabled.color = #3E769D
 manager.scrollbar.thumb.rollover.color = #2F6A90
 manager.scrollbar.thumb.pressed.color = #2F6A90