From 0364ed1be2d7d6f5f22980d9e02fad6b54105449 Mon Sep 17 00:00:00 2001
From: Vantha <valentinthaler75@gmail.com>
Date: Mon, 16 Sep 2024 16:39:22 +0200
Subject: [PATCH] Make the chat notification clickable

---
 .../public/art/textures/ui/session/icons/flare.png    |  3 +++
 .../gui/session/chat/ChatMessageFormatSimulation.js   | 11 ++++++++---
 binaries/data/mods/public/gui/session/setup.xml       |  7 +++++++
 binaries/data/mods/public/gui/session/unit_actions.js |  3 ++-
 4 files changed, 20 insertions(+), 4 deletions(-)
 create mode 100644 binaries/data/mods/public/art/textures/ui/session/icons/flare.png

diff --git a/binaries/data/mods/public/art/textures/ui/session/icons/flare.png b/binaries/data/mods/public/art/textures/ui/session/icons/flare.png
new file mode 100644
index 0000000000..52557740b2
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/session/icons/flare.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:75c0cb62ef735f373aba335ebf63a6c45e1caab5af351f3ac5588a3e9381a367
+size 955
diff --git a/binaries/data/mods/public/gui/session/chat/ChatMessageFormatSimulation.js b/binaries/data/mods/public/gui/session/chat/ChatMessageFormatSimulation.js
index 60848fd0fe..3aafc144ae 100644
--- a/binaries/data/mods/public/gui/session/chat/ChatMessageFormatSimulation.js
+++ b/binaries/data/mods/public/gui/session/chat/ChatMessageFormatSimulation.js
@@ -183,9 +183,14 @@ ChatMessageFormatSimulation.flare = class
 		if (Engine.ConfigDB_GetValue("user", "chat.notifications.flare") != "true")
 			return "";
 		return {
-			"text": sprintf(translate("%(player)s has sent a flare."), {
-				"player": colorizePlayernameByGUID(msg.guid),
-			})
+			"text": sprintf(translate("%(icon)s%(player)s has sent a flare."), {
+				"icon": "[icon=\"icon_flare\" displace=\"0 1\"]",
+				"player": colorizePlayernameByGUID(msg.guid)
+			}),
+			"callback": ((position) => function() {
+				Engine.CameraMoveTo(position.x, position.z);
+			})(msg.position),
+			"tooltip": translate("Click to focus on the flare's location.")
 		};
 	}
 };
diff --git a/binaries/data/mods/public/gui/session/setup.xml b/binaries/data/mods/public/gui/session/setup.xml
index e3d2bb5da1..1f273679a4 100644
--- a/binaries/data/mods/public/gui/session/setup.xml
+++ b/binaries/data/mods/public/gui/session/setup.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <setup>
+
 	<icon name="icon_focusattacked"
 		sprite="stretched:session/icons/focus-attacked.png"
 		size="14 14"
 	/>
+
+	<icon name="icon_flare"
+		sprite="stretched:session/icons/flare.png"
+		size="14 14"
+	/>
+
 </setup>
diff --git a/binaries/data/mods/public/gui/session/unit_actions.js b/binaries/data/mods/public/gui/session/unit_actions.js
index c40731bcf2..316b7115ea 100644
--- a/binaries/data/mods/public/gui/session/unit_actions.js
+++ b/binaries/data/mods/public/gui/session/unit_actions.js
@@ -1949,7 +1949,8 @@ function displayFlare(position, playerGUID)
 	g_MiniMapPanel.flare(position, playerID);
 	addChatMessage({
 		"type": "flare",
-		"guid": playerGUID
+		"guid": playerGUID,
+		"position": position
 	});
 }