Helios Panels - Fix for interactions on template based panels (#483)

HeliosVirtualCockpit · Nov 4, 2021 · f0f9e63 · f0f9e63
1 parent 848416c
commit f0f9e63
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 10 deletions.
diff --git a/Helios/Controls/HeliosPanel.cs b/Helios/Controls/HeliosPanel.cs
@@ -351,9 +351,11 @@ public override void WriteXml(XmlWriter writer)
                 writer.WriteEndElement();
             }
 
+            writer.WriteStartElement("Interaction");
             writer.WriteElementString("AllowInteractionFull", AllowInteractionFull.ToString(CultureInfo.InvariantCulture));
             writer.WriteElementString("AllowInteractionNone", AllowInteractionNone.ToString(CultureInfo.InvariantCulture));
             writer.WriteElementString("AllowInteractionLegacy", AllowInteractionLegacy.ToString(CultureInfo.InvariantCulture));
+            writer.WriteEndElement();
         }
 
         public override void ReadXml(XmlReader reader)
@@ -409,13 +411,15 @@ public override void ReadXml(XmlReader reader)
                 DrawBorder = false;
             }
 
-            try
+            if (reader.Name.Equals("Interaction"))
             {
+                reader.ReadStartElement();
                 AllowInteractionFull = bool.Parse(reader.ReadElementString("AllowInteractionFull"));
                 AllowInteractionNone = bool.Parse(reader.ReadElementString("AllowInteractionNone"));
                 AllowInteractionLegacy = bool.Parse(reader.ReadElementString("AllowInteractionLegacy"));
+                reader.ReadEndElement();
             }
-            catch
+            else
             {
                 AllowInteractionFull = false;
                 AllowInteractionNone = false;

diff --git a/Helios/Controls/ImageTranslucent.cs b/Helios/Controls/ImageTranslucent.cs
@@ -302,13 +302,11 @@ public override void ReadXml(XmlReader reader)
                 BorderThickness = 0d;
             }
 
-            try
+            if (reader.Name.Equals("Interaction"))
             {
+                reader.ReadStartElement("Interaction");
                 AllowInteraction = bool.Parse(reader.ReadElementString("AllowInteraction"));
-            }
-            catch
-            {
-                AllowInteraction = false;
+                reader.ReadEndElement();
             }
 
             // Load base after image so size is properly persisted.
@@ -330,7 +328,9 @@ public override void WriteXml(XmlWriter writer)
                 writer.WriteElementString("Color", colorConverter.ConvertToString(null, System.Globalization.CultureInfo.InvariantCulture, BorderColor));
                 writer.WriteEndElement();
             }
+            writer.WriteStartElement("Interaction");
             writer.WriteElementString("AllowInteraction", AllowInteraction.ToString(CultureInfo.InvariantCulture));
+            writer.WriteEndElement();
 
             // Save base after image so size is properly persisted.
             base.WriteXml(writer);

diff --git a/Helios/Templates/Base/Panels/Empty Panel.htpl b/Helios/Templates/Base/Panels/Empty Panel.htpl
@@ -1 +1 @@
-<ControlTemplate><Name>Empty Panel</Name><Category>Panels</Category><TypeIdentifier>Helios.Panel</TypeIdentifier><Template><TemplateValues><Location>0,0</Location><Size>300,300</Size><Hidden>False</Hidden><Background /></TemplateValues></Template></ControlTemplate>
+<ControlTemplate><Name>Empty Panel</Name><Category>Panels</Category><TypeIdentifier>Helios.Panel</TypeIdentifier><Template><TemplateValues><Location>0,0</Location><Size>300,300</Size><Hidden>False</Hidden><Background /><Interaction><AllowInteractionFull>False</AllowInteractionFull><AllowInteractionNone>True</AllowInteractionNone><AllowInteractionLegacy>False</AllowInteractionLegacy></Interaction></TemplateValues></Template></ControlTemplate>
diff --git a/Helios/Templates/Base/Panels/Generic Backplate.htpl b/Helios/Templates/Base/Panels/Generic Backplate.htpl
@@ -1 +1 @@
-<ControlTemplate><Name>Generic Backplate</Name><Category>Panels</Category><TypeIdentifier>Helios.Panel</TypeIdentifier><Template><TemplateValues><Location>687,19</Location><Size>300,300</Size><Hidden>False</Hidden><Background><Color>#FF1E1E1E</Color><Image /></Background><Border><TopLeftCorner>{Helios}/Images/Panels/panel-backplate-top-left.png</TopLeftCorner><TopBorder>{Helios}/Images/Panels/panel-top.png</TopBorder><TopRightCorner>{Helios}/Images/Panels/panel-backplate-top-right.png</TopRightCorner><RightBorder>{Helios}/Images/Panels/panel-right.png</RightBorder><BottomRightCorner>{Helios}/Images/Panels/panel-backplate-bottom-right.png</BottomRightCorner><BottomBorder>{Helios}/Images/Panels/panel-bottom.png</BottomBorder><BottomLeftCorner>{Helios}/Images/Panels/panel-backplate-bottom-left.png</BottomLeftCorner><LeftBorder>{Helios}/Images/Panels/panel-left.png</LeftBorder></Border></TemplateValues></Template></ControlTemplate>
+<ControlTemplate><Name>Generic Backplate</Name><Category>Panels</Category><TypeIdentifier>Helios.Panel</TypeIdentifier><Template><TemplateValues><Location>687,19</Location><Size>300,300</Size><Hidden>False</Hidden><Background><Color>#FF1E1E1E</Color><Image /></Background><Border><TopLeftCorner>{Helios}/Images/Panels/panel-backplate-top-left.png</TopLeftCorner><TopBorder>{Helios}/Images/Panels/panel-top.png</TopBorder><TopRightCorner>{Helios}/Images/Panels/panel-backplate-top-right.png</TopRightCorner><RightBorder>{Helios}/Images/Panels/panel-right.png</RightBorder><BottomRightCorner>{Helios}/Images/Panels/panel-backplate-bottom-right.png</BottomRightCorner><BottomBorder>{Helios}/Images/Panels/panel-bottom.png</BottomBorder><BottomLeftCorner>{Helios}/Images/Panels/panel-backplate-bottom-left.png</BottomLeftCorner><LeftBorder>{Helios}/Images/Panels/panel-left.png</LeftBorder></Border><Interaction><AllowInteractionFull>False</AllowInteractionFull><AllowInteractionNone>True</AllowInteractionNone><AllowInteractionLegacy>False</AllowInteractionLegacy></Interaction></TemplateValues></Template></ControlTemplate>
diff --git a/Helios/Templates/Base/Panels/Generic Screws.htpl b/Helios/Templates/Base/Panels/Generic Screws.htpl
@@ -1 +1 @@
-<ControlTemplate><Name>Generic Screws</Name><Category>Panels</Category><TypeIdentifier>Helios.Panel</TypeIdentifier><Template><TemplateValues><Location>364,19</Location><Size>300,300</Size><Hidden>False</Hidden><Background><Color>#FF1E1E1E</Color><Image /></Background><Border><TopLeftCorner>{Helios}/Images/Panels/panel-screws-top-left.png</TopLeftCorner><TopBorder>{Helios}/Images/Panels/panel-top.png</TopBorder><TopRightCorner>{Helios}/Images/Panels/panel-screws-top-right.png</TopRightCorner><RightBorder>{Helios}/Images/Panels/panel-right.png</RightBorder><BottomRightCorner>{Helios}/Images/Panels/panel-screws-bottom-right.png</BottomRightCorner><BottomBorder>{Helios}/Images/Panels/panel-bottom.png</BottomBorder><BottomLeftCorner>{Helios}/Images/Panels/panel-screws-bottom-left.png</BottomLeftCorner><LeftBorder>{Helios}/Images/Panels/panel-left.png</LeftBorder></Border></TemplateValues></Template></ControlTemplate>
+<ControlTemplate><Name>Generic Screws</Name><Category>Panels</Category><TypeIdentifier>Helios.Panel</TypeIdentifier><Template><TemplateValues><Location>364,19</Location><Size>300,300</Size><Hidden>False</Hidden><Background><Color>#FF1E1E1E</Color><Image /></Background><Border><TopLeftCorner>{Helios}/Images/Panels/panel-screws-top-left.png</TopLeftCorner><TopBorder>{Helios}/Images/Panels/panel-top.png</TopBorder><TopRightCorner>{Helios}/Images/Panels/panel-screws-top-right.png</TopRightCorner><RightBorder>{Helios}/Images/Panels/panel-right.png</RightBorder><BottomRightCorner>{Helios}/Images/Panels/panel-screws-bottom-right.png</BottomRightCorner><BottomBorder>{Helios}/Images/Panels/panel-bottom.png</BottomBorder><BottomLeftCorner>{Helios}/Images/Panels/panel-screws-bottom-left.png</BottomLeftCorner><LeftBorder>{Helios}/Images/Panels/panel-left.png</LeftBorder></Border><Interaction><AllowInteractionFull>False</AllowInteractionFull><AllowInteractionNone>True</AllowInteractionNone><AllowInteractionLegacy>False</AllowInteractionLegacy></Interaction></TemplateValues></Template></ControlTemplate>