Composite controls support, scrollable panel support, map INI checker

.github/workflows/build.yml

@@ -12,6 +12,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
       with:
+        submodules: recursive
         fetch-depth: 0
 
     - name: Setup .NET SDK

.github/workflows/release-build.yml

@@ -12,6 +12,7 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v4
       with:
+        submodules: recursive
         fetch-depth: 0
 
     - name: Setup .NET SDK

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "Rampastring.XNAUI"]
+	path = Rampastring.XNAUI
+	url = ../../Rampastring/Rampastring.XNAUI.git

ClientCore/ClientCore.csproj

@@ -7,10 +7,11 @@
     <EmbeddedResource Include="Resources\*.png" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Rampastring.Tools" />
-    <PackageReference Include="Rampastring.XNAUI.$(Engine)" Condition="'!$(Configuration.Contains(Debug))'" />
-    <PackageReference Include="Rampastring.XNAUI.$(Engine).Debug" Condition="'$(Configuration.Contains(Debug))'" />
     <PackageReference Include="System.Text.Encoding.CodePages" />
     <PackageReference Include="Ude.NetStandard" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Rampastring.XNAUI\Rampastring.Tools\Rampastring.Tools.csproj" />
+    <ProjectReference Include="..\Rampastring.XNAUI\Rampastring.XNAUI.csproj" />
+  </ItemGroup>
 </Project>

ClientGUI/ICompositeControl.cs

@@ -0,0 +1,21 @@
+using System.Collections.Generic;
+
+using Rampastring.XNAUI.XNAControls;
+
+namespace ClientGUI;
+
+/// <summary>
+/// Indicates that the implementer has sub-controls that need to be exposed to INI system.
+/// </summary>
+public interface ICompositeControl
+{
+    /// <summary>
+    /// The sub-controls that are exposed to the INI system.
+    /// </summary>
+    /// <remarks>
+    /// All the sub-controls should have their names set to something
+    /// unique to each composite control. Utilise <see cref="XNAControl.NameChanged"/>
+    /// event to set the names of the sub-controls.
+    /// </remarks>
+    IReadOnlyList<XNAControl> SubControls { get; }
+}

ClientGUI/INItializableWindow.cs

@@ -143,14 +143,6 @@ private void ParseExtraControls()
             }
         }
 
-        private void ReadINIRecursive(XNAControl control)
-        {
-            ReadINIForControl(control);
-
-            foreach (var child in control.Children)
-                ReadINIRecursive(child);
-        }
-
         protected override void ParseControlINIAttribute(IniFile iniFile, string key, string value)
         {
             if (key == "HasCloseButton")
@@ -178,6 +170,15 @@ static string Localize(XNAControl control, string attributeName, string defaultV
                     var child = CreateChildControl(control, kvp.Value);
                     ReadINIForControl(child);
                     child.Initialize();
+
+                    if (child is ICompositeControl composite)
+                    {
+                        foreach (var sc in composite.SubControls)
+                        {
+                            ReadINIForControl(sc);
+                            sc.Initialize();
+                        }
+                    }
                 }
                 else if (kvp.Key == "$X")
                 {
@@ -211,6 +212,28 @@ static string Localize(XNAControl control, string attributeName, string defaultV
                         throw new FormatException("Invalid format for AnchorPoint: " + kvp.Value);
                     ((XNALabel)control).AnchorPoint = new Vector2(Parser.Instance.GetExprValue(parts[0], control), Parser.Instance.GetExprValue(parts[1], control));
                 }
+                else if (kvp.Key == "$OverscrollMargin" && control is XNAScrollPanel scrollPanel)
+                {
+                    string[] parts = kvp.Value.Split(',');
+                    (int X, int Y) values = parts
+                        .Select(s => Parser.Instance.GetExprValue(s, control))
+                        .ToArray().AsTuple2();
+                    scrollPanel.OverscrollMargin = new(values.X, values.Y);
+                }
+                else if (kvp.Key == "$OverscrollMarginX" && control is XNAScrollPanel scrollPanel1)
+                {
+                    scrollPanel1.OverscrollMargin = scrollPanel1.OverscrollMargin with
+                    {
+                        X = Parser.Instance.GetExprValue(kvp.Value, control)
+                    };
+                }
+                else if (kvp.Key == "$OverscrollMarginY" && control is XNAScrollPanel scrollPanel2)
+                {
+                    scrollPanel2.OverscrollMargin = scrollPanel2.OverscrollMargin with
+                    {
+                        Y = Parser.Instance.GetExprValue(kvp.Value, control)
+                    };
+                }
                 else if (kvp.Key == "$LeftClickAction")
                 {
                     if (kvp.Value == "Disable")

ClientGUI/Parser.cs

@@ -227,7 +227,7 @@ private string GetIdentifier()
                 if (char.IsWhiteSpace(c))
                     break;
 
-                if (!char.IsLetterOrDigit(c) && c != '_' && c != '$')
+                if (!char.IsLetterOrDigit(c) && c != '_' && c != '$' && c != '.')
                     break;
 
                 identifierName += c.ToString();

ClientGUI/XNAClientDropDown.cs

@@ -46,9 +46,10 @@ protected override void ParseControlINIAttribute(IniFile iniFile, string key, st
             base.ParseControlINIAttribute(iniFile, key, value);
         }
 
-        public override void OnMouseLeftDown()
+        public override void OnMouseLeftDown(InputEventArgs inputEventArgs)
         {
-            base.OnMouseLeftDown();
+            // no need to set Handled to true since we're not "consuming" the event here, just augmenting
+            base.OnMouseLeftDown(inputEventArgs);
             UpdateToolTipBlock();
         }
 

ClientGUI/XNAClientLinkLabel.cs

@@ -99,8 +99,10 @@ public override void OnMouseLeave()
             TextColor = IdleColor;
         }
 
-        public override void OnLeftClick()
+        public override void OnLeftClick(InputEventArgs inputEventArgs)
         {
+            inputEventArgs.Handled = true;
+
             ClickSoundEffect?.Play();
 
             OSVersion osVersion = ClientConfiguration.Instance.GetOperatingSystemVersion();
@@ -110,7 +112,7 @@ public override void OnLeftClick()
             else if (!string.IsNullOrEmpty(URL))
                 ProcessLauncher.StartShellProcess(URL);
 
-            base.OnLeftClick();
+            base.OnLeftClick(inputEventArgs);
         }
     }
 }

ClientGUI/XNAClientScrollPanel.cs

@@ -0,0 +1,24 @@
+using System.Collections.Generic;
+
+using Rampastring.XNAUI;
+using Rampastring.XNAUI.XNAControls;
+
+namespace ClientGUI;
+
+public class XNAClientScrollPanel : XNAScrollPanel, ICompositeControl
+{
+    public IReadOnlyList<XNAControl> SubControls
+        => [ContentPanel, HorizontalScrollBar, VerticalScrollBar, CornerPanel];
+
+    public XNAClientScrollPanel(WindowManager windowManager) : base(windowManager) { }
+
+    protected override void ComposeControls()
+    {
+        // this is needed for the control composition to work properly, as otherwise
+        // the controls will be initialized twice via INItializableWindow system
+        AddChildWithoutInitialize(ContentPanel);
+        AddChildWithoutInitialize(HorizontalScrollBar);
+        AddChildWithoutInitialize(VerticalScrollBar);
+        AddChildWithoutInitialize(CornerPanel);
+    }
+}

ClientGUI/XNALinkButton.cs

@@ -36,16 +36,18 @@ protected override void ParseControlINIAttribute(IniFile iniFile, string key, st
             base.ParseControlINIAttribute(iniFile, key, value);
         }
 
-        public override void OnLeftClick()
+        public override void OnLeftClick(InputEventArgs inputEventArgs)
         {
+            inputEventArgs.Handled = true;
+
             OSVersion osVersion = ClientConfiguration.Instance.GetOperatingSystemVersion();
 
             if (osVersion == OSVersion.UNIX && !string.IsNullOrEmpty(UnixURL))
                 ProcessLauncher.StartShellProcess(UnixURL, Arguments);
             else if (!string.IsNullOrEmpty(URL))
                 ProcessLauncher.StartShellProcess(URL, Arguments);
 
-            base.OnLeftClick();
+            base.OnLeftClick(inputEventArgs);
         }
     }
 }

ClientUpdater/ClientUpdater.csproj

@@ -6,7 +6,6 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNet.WebApi.Client" />
-    <PackageReference Include="Rampastring.Tools" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ClientCore\ClientCore.csproj" />