From 3f4b996f07de69ef123fa341c72861c8a816fc50 Mon Sep 17 00:00:00 2001
From: PlayeRom <roman.ludwicki@playerom.com>
Date: Wed, 8 Mar 2023 17:34:49 +0100
Subject: [PATCH] Remove the hardcoded canvas texture indexes

Add index search by texture name instead.
---
 gui/dialogs/mcdu1-dlg.xml | 11 ++++++++++-
 gui/dialogs/mcdu2-dlg.xml | 11 ++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/gui/dialogs/mcdu1-dlg.xml b/gui/dialogs/mcdu1-dlg.xml
index 80550bee..6dc82bf9 100644
--- a/gui/dialogs/mcdu1-dlg.xml
+++ b/gui/dialogs/mcdu1-dlg.xml
@@ -179,11 +179,20 @@
 			<nasal>
 				<load>
 					<![CDATA[
+						var textureIndex = 15;
+						foreach (var texture; props.globals.getNode("/canvas/by-index").getChildren("texture")) {
+							var name = texture.getChild("name");
+							if (name != nil and name.getValue() == "MCDU1") {
+								textureIndex = texture.getIndex();
+								break;
+							}
+						}
+
 						var mcdu_canvas_dlg = canvas.get(cmdarg());
 						var root = mcdu_canvas_dlg.createGroup();
 						root.setScale(0.285, 0.25);
 						mcdu_canvas_dlg.setColorBackground(0, 0, 0, 1.0);
-						root.createChild("image").set("src", "canvas://by-index/texture[15]");
+						root.createChild("image").set("src", "canvas://by-index/texture[" ~ textureIndex ~ "]");
 					]]>
 				</load>
 				<unload>
diff --git a/gui/dialogs/mcdu2-dlg.xml b/gui/dialogs/mcdu2-dlg.xml
index 109e1bb7..2e00cc5b 100644
--- a/gui/dialogs/mcdu2-dlg.xml
+++ b/gui/dialogs/mcdu2-dlg.xml
@@ -179,11 +179,20 @@
 			<nasal>
 				<load>
 					<![CDATA[
+						var textureIndex = 16;
+						foreach (var texture; props.globals.getNode("/canvas/by-index").getChildren("texture")) {
+							var name = texture.getChild("name");
+							if (name != nil and name.getValue() == "MCDU2") {
+								textureIndex = texture.getIndex();
+								break;
+							}
+						}
+
 						var mcdu_canvas_dlg = canvas.get(cmdarg());
 						var root = mcdu_canvas_dlg.createGroup();
 						root.setScale(0.285, 0.25);
 						mcdu_canvas_dlg.setColorBackground(0, 0, 0, 1.0);
-						root.createChild("image").set("src", "canvas://by-index/texture[16]");
+						root.createChild("image").set("src", "canvas://by-index/texture[" ~ textureIndex ~ "]");
 					]]>
 				</load>
 				<unload>