From e2d68b91cdb6b5b70f0883ed465ffabc1590407f Mon Sep 17 00:00:00 2001
From: 2hwk <15316958+2hwk@users.noreply.github.com>
Date: Sat, 16 Nov 2024 01:08:51 +0800
Subject: [PATCH] fix(a380x/efb): Fixed window handle being clickable through
 flyPad Screen (#9496)

* fix: defined EFB with no interaction template disabling mouse clicks going through the display

* chore: changelog.md

* feat: switch to our own template for this
---
 .github/CHANGELOG.md                                  |  1 +
 .../ModelBehaviorDefs/A32NX/Airbus.xml                | 11 +++++++++++
 .../FlyByWire_A380_842/model/A380_COCKPIT.xml         |  1 +
 .../model/behaviour/legacy/Airbus.xml                 | 11 +++++++++++
 4 files changed, 24 insertions(+)

diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md
index e5ae4fd4978..8d6981a7f78 100644
--- a/.github/CHANGELOG.md
+++ b/.github/CHANGELOG.md
@@ -56,6 +56,7 @@
 1. [A380X/FMS] Fixed handling of window altitude constraints, deletion of constraints, and formatting - @tracernz (Mike)
 1. [A380X/SD] Fix engine fuel flow and fuel used on cruise page still use only ENG 1 + 2 LVars @heclak (heclak)
 1. [A380X/ENG] Improved engine fire behaviour - overhead fire pushbuttons silence aural warning and unpowers FADEC - @mjuhe (Miquel Juhe)
+1. [A380X/EFB] Fixed being able to click on window open handle through the flyPad screen - @2hwk (2cas)
 
 ## 0.12.0
 
diff --git a/fbw-a32nx/src/base/flybywire-aircraft-a320-neo/ModelBehaviorDefs/A32NX/Airbus.xml b/fbw-a32nx/src/base/flybywire-aircraft-a320-neo/ModelBehaviorDefs/A32NX/Airbus.xml
index a574c51c9ae..fc382d5546b 100644
--- a/fbw-a32nx/src/base/flybywire-aircraft-a320-neo/ModelBehaviorDefs/A32NX/Airbus.xml
+++ b/fbw-a32nx/src/base/flybywire-aircraft-a320-neo/ModelBehaviorDefs/A32NX/Airbus.xml
@@ -1365,4 +1365,15 @@
             </Condition>
         </UseTemplate>
     </Template>
+
+    <Template Name="FBW_GT_Interaction_NoInteraction">
+        <DefaultTemplateParameters>
+            <DISABLE_MOUSERECT>True</DISABLE_MOUSERECT>
+            <CURSOR>Hand</CURSOR>
+        </DefaultTemplateParameters>
+
+        <UseTemplate Name="ASOBO_GT_MouseRect">
+            <CALLBACKCODE>0</CALLBACKCODE>
+        </UseTemplate>
+    </Template>
 </ModelBehaviors>
diff --git a/fbw-a380x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/model/A380_COCKPIT.xml b/fbw-a380x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/model/A380_COCKPIT.xml
index cc301ff3904..075a3a54a83 100644
--- a/fbw-a380x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/model/A380_COCKPIT.xml
+++ b/fbw-a380x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/model/A380_COCKPIT.xml
@@ -397,6 +397,7 @@
                 <UseTemplate Name="ASOBO_GT_Material_Emissive_Code">
                     <EMISSIVE_CODE>(L:A32NX_EFB_BRIGHTNESS, number) 10 max 100 min 100 /</EMISSIVE_CODE>
                 </UseTemplate>
+                <UseTemplate Name="FBW_GT_Interaction_NoInteraction"/>
             </Component>
             <Component ID="PUSH_EFB_SIDE" Node="PUSH_EFB_SIDE">
                 <UseTemplate Name="ASOBO_GT_Push_Button">
diff --git a/fbw-a380x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/model/behaviour/legacy/Airbus.xml b/fbw-a380x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/model/behaviour/legacy/Airbus.xml
index 8789fc62410..19fcd8c2151 100644
--- a/fbw-a380x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/model/behaviour/legacy/Airbus.xml
+++ b/fbw-a380x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/model/behaviour/legacy/Airbus.xml
@@ -1081,4 +1081,15 @@
             </Condition>
         </UseTemplate>
     </Template>
+
+    <Template Name="FBW_GT_Interaction_NoInteraction">
+        <DefaultTemplateParameters>
+            <DISABLE_MOUSERECT>True</DISABLE_MOUSERECT>
+            <CURSOR>Hand</CURSOR>
+        </DefaultTemplateParameters>
+
+        <UseTemplate Name="ASOBO_GT_MouseRect">
+            <CALLBACKCODE>0</CALLBACKCODE>
+        </UseTemplate>
+    </Template>
 </ModelBehaviors>