From ef00bbcdd421fa9e6bd9e554ccd76e3635b98f56 Mon Sep 17 00:00:00 2001
From: Clownacy <Clownacy@users.noreply.github.com>
Date: Thu, 2 Apr 2020 22:03:08 +0100
Subject: [PATCH] Get window icon working in GLFW

Amazingly, this actually works in SDL2, so now they both use this
method.
---
 assets/resources/CSE2.rc            |   3 +--
 assets/resources/ICON/0.ico         | Bin 766 -> 0 bytes
 assets/resources/ICON/GLFW_ICON.ico | Bin 0 -> 1078 bytes
 assets/resources/ICON/ICON_MINI.ico | Bin 318 -> 0 bytes
 src/Backends/Platform/SDL2.cpp      |   5 -----
 src/Main.cpp                        |   1 -
 6 files changed, 1 insertion(+), 8 deletions(-)
 delete mode 100644 assets/resources/ICON/0.ico
 create mode 100644 assets/resources/ICON/GLFW_ICON.ico
 delete mode 100644 assets/resources/ICON/ICON_MINI.ico

diff --git a/assets/resources/CSE2.rc b/assets/resources/CSE2.rc
index 48848b9a..02239a9d 100644
--- a/assets/resources/CSE2.rc
+++ b/assets/resources/CSE2.rc
@@ -66,8 +66,7 @@ END
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-101                       ICON                    "ICON/0.ico"
-102                       ICON                    "ICON/ICON_MINI.ico"
+GLFW_ICON                 ICON                    "ICON/GLFW_ICON.ico"
 #endif    // Japanese resources
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/assets/resources/ICON/0.ico b/assets/resources/ICON/0.ico
deleted file mode 100644
index 33fc2aa3c0323cfa9877ff309e47b8640446278d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 766
zcmcgqF>b>!45XU^Dzc<gXODeGw~YCUH_B7JNk1_Bf{Y!z`Y9drgQ632M<POv4%vDV
zWgd?rX(u8bR^LAhad{AV!SfZ?!`@(>JmLhP-N5X)!N}xWrimU53(mT(crs$X#f%;d
ziy<EOpc{y6sDdX=DX9)F1s|9+E;zu232>J=xM!=rFV=K8NIe91@|zdUj7{GRqJQx%
zPxN8AXem12Wh}W~GeRFHv(uiu5PEJryRJvGV><i&T#JsZHGc-@@Wkx(*jyFmf1-cz
zIFY{r`(fIWb4AgZ595Gm&dqvo$(zo%qmH3n=Xj`rnS+O3TYlwL*sVU(8vf36=lA7j
O`@&yr{a@R$FL4Fmgze1$

diff --git a/assets/resources/ICON/GLFW_ICON.ico b/assets/resources/ICON/GLFW_ICON.ico
new file mode 100644
index 0000000000000000000000000000000000000000..4139b41ed4f1e3a7f6e3e0cb709cd6fa8ff821b7
GIT binary patch
literal 1078
zcmcgryG{c!5ZpX0+H0b;kx?LJ6k}-9M0Ds9v*HWr2@ko=r`@Me@)yU<nw%0LB^8X$
z-kqKG?%qqJCw-}^3U(;7p2(GmOeTeY^+g^Kn;}*)j>WuF*qPYMZU?UwX_^MM#RYN(
zAq0^D_7MD~nXvH1X8&f+ixj@Mch0y-O<|q^6j*L^-oF3X$8a-W=e$ngb|IpQ$_r1x
zxki2|$o<TCXJtO83Dy$pFP{_2pN1ZRH+=|jr_MRm+N8p3rffVmaA5*mKP}v{RiAwB
zbT~-8DBQ>)kD3^pe=vyt(JmR#$4XIS)S9o$nH~~C_v4($L-I)Is^iIY9pyZ7D?6V;
z)D3G*p9|;k#MJ7cEr9Z`rGMdNNB$Am57Wk!0*aRTFb;U)+^h$eywiDi)G@T_!E}rb
lYW+>eC&d8H2Oh=RbEb9pJ<sX4%YUi;#3$DL?;5Z#@eS7E$KL<|

literal 0
HcmV?d00001

diff --git a/assets/resources/ICON/ICON_MINI.ico b/assets/resources/ICON/ICON_MINI.ico
deleted file mode 100644
index b540fd2fe52b760d991d476e09c811c429acc7b5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 318
zcmbtOyAHxI47^B4bj-xe$meyaRK(=bfq}J|;8XHR3>^@QIXmSGaN@i3Bc}j~C+7^0
zQvwdoOz#|-2|FSnfgOC-UwAEjC=xr4lxVGyDPVD7=8DPVErO~715vduL0W2OtM3pm
vUt;|DzK;?ZeIRtPLG`(st)GoAdX>p+I_s?f^GxSbJt!XB4};BxANnJ{3z1#C

diff --git a/src/Backends/Platform/SDL2.cpp b/src/Backends/Platform/SDL2.cpp
index b24deb70..1c221881 100644
--- a/src/Backends/Platform/SDL2.cpp
+++ b/src/Backends/Platform/SDL2.cpp
@@ -27,11 +27,6 @@ void PlatformBackend_Init(void)
 {
 	SDL_Init(SDL_INIT_EVENTS);
 
-#ifdef _WIN32	// On Windows, we use native icons instead (so we can give the taskbar and window separate icons, like the original EXE does)
-	SDL_SetHint(SDL_HINT_WINDOWS_INTRESOURCE_ICON, "101");
-	SDL_SetHint(SDL_HINT_WINDOWS_INTRESOURCE_ICON_SMALL, "102");
-#endif
-
 	SDL_InitSubSystem(SDL_INIT_VIDEO);
 
 	puts("Available SDL2 video drivers:");
diff --git a/src/Main.cpp b/src/Main.cpp
index 8f577866..50b7dc06 100644
--- a/src/Main.cpp
+++ b/src/Main.cpp
@@ -273,7 +273,6 @@ int main(int argc, char *argv[])
 #endif
 
 	// Set up window icon
-	// TODO - GLFW_ICON
 #ifndef _WIN32	// On Windows, we use native icons instead (so we can give the taskbar and window separate icons, like the original EXE does)
 	size_t window_icon_resource_size;
 	const unsigned char *window_icon_resource_data = FindResource("ICON_MINI", "ICON", &window_icon_resource_size);