Skip to content

Composite controls support, scrollable panel support, submodules #773

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Metadorius wants to merge 16 commits into
base: develop
Choose a base branch
from
Draft

Composite controls support, scrollable panel support, submodules #773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
98f5c3a
Implement composite controls support for `INItializableWindow` system
Metadorius Jul 3, 2025
b36d1d5
Fix oversights
Metadorius Jul 3, 2025
8e1bdc8
Adjust for the latest ScrollPanel version
Metadorius Jul 4, 2025
448c030
Add horizontal scrollbar assets
Metadorius Jul 4, 2025
bb43277
Support `.` in control name
Metadorius Jul 6, 2025
99b5726
Support `$OverscrollMargin[X/Y]`
Metadorius Jul 6, 2025
00d469f
Fix outdated composite control comment
Metadorius Jul 23, 2025
7fa3ce2
Upgrade to XNAUI v3.x.x input handling
Metadorius Jul 23, 2025
54c50c2
[TEMP] Switch to submodules for Rampa's libraries and point to releva…
Metadorius Jul 24, 2025
f568260
Update submodule
Metadorius Aug 4, 2025
ced626b
Fix XNA compilation
Metadorius Aug 4, 2025
6e5762f
Update XNAUI
Metadorius Aug 4, 2025
6f33729
Merge branch 'develop' into feature/map-ini-checker
Metadorius Oct 21, 2025
3853bcc
Update submodule
Metadorius Oct 21, 2025
f550ba6
Fix incorrect usage of XNAUI reference
SadPencil Oct 22, 2025
05f824a
Remove XNAUI reference in ClientCore
SadPencil Oct 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ jobs:
steps:
- uses: actions/checkout@v4
with:
submodules: recursive
fetch-depth: 0

- name: Setup .NET SDK
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/release-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
with:
submodules: recursive
fetch-depth: 0

- name: Setup .NET SDK
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "Rampastring.XNAUI"]
path = Rampastring.XNAUI
url = ../../Rampastring/Rampastring.XNAUI.git
10 changes: 8 additions & 2 deletions ClientCore/ClientCore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Description>CnCNet Client Core Library</Description>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Rampastring.Tools" />
<None Remove="Resources\*.png" />
<EmbeddedResource Include="Resources\*.png" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="System.Text.Encoding.CodePages" />
<PackageReference Include="Ude.NetStandard" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Rampastring.XNAUI\Rampastring.Tools\Rampastring.Tools.csproj" />
</ItemGroup>
</Project>
3 changes: 1 addition & 2 deletions ClientGUI/ClientGUI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
<ProjectReference Include="..\ClientCore\ClientCore.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Rampastring.XNAUI.$(Engine)" Condition="'!$(Configuration.Contains(Debug))'" />
<PackageReference Include="Rampastring.XNAUI.$(Engine).Debug" Condition="'$(Configuration.Contains(Debug))'" />
<ProjectReference Include="..\Rampastring.XNAUI\Rampastring.XNAUI.csproj" />
</ItemGroup>
<ItemGroup Condition="$(Configuration.Contains('GL'))">
<!--Remove WinForm-->
Expand Down
2 changes: 1 addition & 1 deletion ClientGUI/ICompositeControl.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System.Collections.Generic;
using System.Collections.Generic;

using Rampastring.XNAUI.XNAControls;

Expand Down
22 changes: 22 additions & 0 deletions ClientGUI/INItializableWindow.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,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")
Expand Down
24 changes: 24 additions & 0 deletions ClientGUI/XNAClientScrollPanel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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);
}
}
1 change: 0 additions & 1 deletion ClientUpdater/ClientUpdater.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNet.WebApi.Client" />
<PackageReference Include="Rampastring.Tools" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ClientCore\ClientCore.csproj" />
Expand Down
134 changes: 133 additions & 1 deletion DXClient.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Microsoft Visual Studio Solution File, Format Version 12.00
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.2.32408.312
MinimumVisualStudioVersion = 10.0.40219.1
Expand Down Expand Up @@ -27,6 +27,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SecondStageUpdater", "Secon
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClientUpdater", "ClientUpdater\ClientUpdater.csproj", "{551D080B-5624-4793-AC31-69D77C62F6B1}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Rampastring.XNAUI", "Rampastring.XNAUI\Rampastring.XNAUI.csproj", "{C15C1D44-721E-4756-B3C9-2A3C0458E584}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Rampastring.Tools", "Rampastring.XNAUI\Rampastring.Tools\Rampastring.Tools.csproj", "{21AD0890-4BF1-4E28-8C8F-D4350982D1E7}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
UniversalGLDebug|Any CPU = UniversalGLDebug|Any CPU
Expand Down Expand Up @@ -447,6 +451,134 @@ Global
{551D080B-5624-4793-AC31-69D77C62F6B1}.WindowsXNARelease|x64.Build.0 = WindowsXNARelease|x64
{551D080B-5624-4793-AC31-69D77C62F6B1}.WindowsXNARelease|x86.ActiveCfg = WindowsXNARelease|x86
{551D080B-5624-4793-AC31-69D77C62F6B1}.WindowsXNARelease|x86.Build.0 = WindowsXNARelease|x86
{C15C1D44-721E-4756-B3C9-2A3C0458E584}.UniversalGLDebug|Any CPU.ActiveCfg = UniversalGLDebug|Any CPU
{C15C1D44-721E-4756-B3C9-2A3C0458E584}.UniversalGLDebug|Any CPU.Build.0 = UniversalGLDebug|Any CPU
{C15C1D44-721E-4756-B3C9-2A3C0458E584}.UniversalGLDebug|ARM64.ActiveCfg = UniversalGLDebug|Any CPU
{C15C1D44-721E-4756-B3C9-2A3C0458E584}.UniversalGLDebug|ARM64.Build.0 = UniversalGLDebug|Any CPU
{C15C1D44-721E-4756-B3C9-2A3C0458E584}.UniversalGLDebug|x64.ActiveCfg = UniversalGLDebug|Any CPU
{C15C1D44-721E-4756-B3C9-2A3C0458E584}.UniversalGLDebug|x64.Build.0 = UniversalGLDebug|Any CPU
{C15C1D44-721E-4756-B3C9-2A3C0458E584}.UniversalGLDebug|x86.ActiveCfg = UniversalGLDebug|Any CPU
{C15C1D44-721E-4756-B3C9-2A3C0458E584}.UniversalGLDebug|x86.Build.0 = UniversalGLDebug|Any CPU
{C15C1D44-721E-4756-B3C9-2A3C0458E584}.UniversalGLRelease|Any CPU.ActiveCfg = UniversalGLRelease|Any CPU
{C15C1D44-721E-4756-B3C9-2A3C0458E584}.UniversalGLRelease|Any CPU.Build.0 = UniversalGLRelease|Any CPU
{C15C1D44-721E-4756-B3C9-2A3C0458E584}.UniversalGLRelease|ARM64.ActiveCfg = UniversalGLRelease|Any CPU
{C15C1D44-721E-4756-B3C9-2A3C0458E584}.UniversalGLRelease|ARM64.Build.0 = UniversalGLRelease|Any CPU
{C15C1D44-721E-4756-B3C9-2A3C0458E584}.UniversalGLRelease|x64.ActiveCfg = UniversalGLRelease|Any CPU
{C15C1D44-721E-4756-B3C9-2A3C0458E584}.UniversalGLRelease|x64.Build.0 = UniversalGLRelease|Any CPU
{C15C1D44-721E-4756-B3C9-2A3C0458E584}.UniversalGLRelease|x86.ActiveCfg = UniversalGLRelease|Any CPU
{C15C1D44-721E-4756-B3C9-2A3C0458E584}.UniversalGLRelease|x86.Build.0 = UniversalGLRelease|Any CPU
{C15C1D44-721E-4756-B3C9-2A3C0458E584}.WindowsDXDebug|Any CPU.ActiveCfg = WindowsDXDebug|Any CPU
{C15C1D44-721E-4756-B3C9-2A3C0458E584}.WindowsDXDebug|Any CPU.Build.0 = WindowsDXDebug|Any CPU
{C15C1D44-721E-4756-B3C9-2A3C0458E584}.WindowsDXDebug|ARM64.ActiveCfg = WindowsDXDebug|Any CPU
{C15C1D44-721E-4756-B3C9-2A3C0458E584}.WindowsDXDebug|ARM64.Build.0 = WindowsDXDebug|Any CPU
{C15C1D44-721E-4756-B3C9-2A3C0458E584}.WindowsDXDebug|x64.ActiveCfg = WindowsDXDebug|Any CPU
{C15C1D44-721E-4756-B3C9-2A3C0458E584}.WindowsDXDebug|x64.Build.0 = WindowsDXDebug|Any CPU
{C15C1D44-721E-4756-B3C9-2A3C0458E584}.WindowsDXDebug|x86.ActiveCfg = WindowsDXDebug|Any CPU
{C15C1D44-721E-4756-B3C9-2A3C0458E584}.WindowsDXDebug|x86.Build.0 = WindowsDXDebug|Any CPU
{C15C1D44-721E-4756-B3C9-2A3C0458E584}.WindowsDXRelease|Any CPU.ActiveCfg = WindowsDXRelease|Any CPU
{C15C1D44-721E-4756-B3C9-2A3C0458E584}.WindowsDXRelease|Any CPU.Build.0 = WindowsDXRelease|Any CPU
{C15C1D44-721E-4756-B3C9-2A3C0458E584}.WindowsDXRelease|ARM64.ActiveCfg = WindowsDXRelease|Any CPU
{C15C1D44-721E-4756-B3C9-2A3C0458E584}.WindowsDXRelease|ARM64.Build.0 = WindowsDXRelease|Any CPU
{C15C1D44-721E-4756-B3C9-2A3C0458E584}.WindowsDXRelease|x64.ActiveCfg = WindowsDXRelease|Any CPU
{C15C1D44-721E-4756-B3C9-2A3C0458E584}.WindowsDXRelease|x64.Build.0 = WindowsDXRelease|Any CPU
{C15C1D44-721E-4756-B3C9-2A3C0458E584}.WindowsDXRelease|x86.ActiveCfg = WindowsDXRelease|Any CPU
{C15C1D44-721E-4756-B3C9-2A3C0458E584}.WindowsDXRelease|x86.Build.0 = WindowsDXRelease|Any CPU
{C15C1D44-721E-4756-B3C9-2A3C0458E584}.WindowsGLDebug|Any CPU.ActiveCfg = WindowsGLDebug|Any CPU
{C15C1D44-721E-4756-B3C9-2A3C0458E584}.WindowsGLDebug|Any CPU.Build.0 = WindowsGLDebug|Any CPU
{C15C1D44-721E-4756-B3C9-2A3C0458E584}.WindowsGLDebug|ARM64.ActiveCfg = WindowsGLDebug|Any CPU
{C15C1D44-721E-4756-B3C9-2A3C0458E584}.WindowsGLDebug|ARM64.Build.0 = WindowsGLDebug|Any CPU
{C15C1D44-721E-4756-B3C9-2A3C0458E584}.WindowsGLDebug|x64.ActiveCfg = WindowsGLDebug|Any CPU
{C15C1D44-721E-4756-B3C9-2A3C0458E584}.WindowsGLDebug|x64.Build.0 = WindowsGLDebug|Any CPU
{C15C1D44-721E-4756-B3C9-2A3C0458E584}.WindowsGLDebug|x86.ActiveCfg = WindowsGLDebug|Any CPU
{C15C1D44-721E-4756-B3C9-2A3C0458E584}.WindowsGLDebug|x86.Build.0 = WindowsGLDebug|Any CPU
{C15C1D44-721E-4756-B3C9-2A3C0458E584}.WindowsGLRelease|Any CPU.ActiveCfg = WindowsGLRelease|Any CPU
{C15C1D44-721E-4756-B3C9-2A3C0458E584}.WindowsGLRelease|Any CPU.Build.0 = WindowsGLRelease|Any CPU
{C15C1D44-721E-4756-B3C9-2A3C0458E584}.WindowsGLRelease|ARM64.ActiveCfg = WindowsGLRelease|Any CPU
{C15C1D44-721E-4756-B3C9-2A3C0458E584}.WindowsGLRelease|ARM64.Build.0 = WindowsGLRelease|Any CPU
{C15C1D44-721E-4756-B3C9-2A3C0458E584}.WindowsGLRelease|x64.ActiveCfg = WindowsGLRelease|Any CPU
{C15C1D44-721E-4756-B3C9-2A3C0458E584}.WindowsGLRelease|x64.Build.0 = WindowsGLRelease|Any CPU
{C15C1D44-721E-4756-B3C9-2A3C0458E584}.WindowsGLRelease|x86.ActiveCfg = WindowsGLRelease|Any CPU
{C15C1D44-721E-4756-B3C9-2A3C0458E584}.WindowsGLRelease|x86.Build.0 = WindowsGLRelease|Any CPU
{C15C1D44-721E-4756-B3C9-2A3C0458E584}.WindowsXNADebug|Any CPU.ActiveCfg = WindowsXNADebug|Any CPU
{C15C1D44-721E-4756-B3C9-2A3C0458E584}.WindowsXNADebug|Any CPU.Build.0 = WindowsXNADebug|Any CPU
{C15C1D44-721E-4756-B3C9-2A3C0458E584}.WindowsXNADebug|ARM64.ActiveCfg = WindowsXNADebug|Any CPU
{C15C1D44-721E-4756-B3C9-2A3C0458E584}.WindowsXNADebug|ARM64.Build.0 = WindowsXNADebug|Any CPU
{C15C1D44-721E-4756-B3C9-2A3C0458E584}.WindowsXNADebug|x64.ActiveCfg = WindowsXNADebug|Any CPU
{C15C1D44-721E-4756-B3C9-2A3C0458E584}.WindowsXNADebug|x64.Build.0 = WindowsXNADebug|Any CPU
{C15C1D44-721E-4756-B3C9-2A3C0458E584}.WindowsXNADebug|x86.ActiveCfg = WindowsXNADebug|Any CPU
{C15C1D44-721E-4756-B3C9-2A3C0458E584}.WindowsXNADebug|x86.Build.0 = WindowsXNADebug|Any CPU
{C15C1D44-721E-4756-B3C9-2A3C0458E584}.WindowsXNARelease|Any CPU.ActiveCfg = WindowsXNARelease|Any CPU
{C15C1D44-721E-4756-B3C9-2A3C0458E584}.WindowsXNARelease|Any CPU.Build.0 = WindowsXNARelease|Any CPU
{C15C1D44-721E-4756-B3C9-2A3C0458E584}.WindowsXNARelease|ARM64.ActiveCfg = WindowsXNARelease|Any CPU
{C15C1D44-721E-4756-B3C9-2A3C0458E584}.WindowsXNARelease|ARM64.Build.0 = WindowsXNARelease|Any CPU
{C15C1D44-721E-4756-B3C9-2A3C0458E584}.WindowsXNARelease|x64.ActiveCfg = WindowsXNARelease|Any CPU
{C15C1D44-721E-4756-B3C9-2A3C0458E584}.WindowsXNARelease|x64.Build.0 = WindowsXNARelease|Any CPU
{C15C1D44-721E-4756-B3C9-2A3C0458E584}.WindowsXNARelease|x86.ActiveCfg = WindowsXNARelease|Any CPU
{C15C1D44-721E-4756-B3C9-2A3C0458E584}.WindowsXNARelease|x86.Build.0 = WindowsXNARelease|Any CPU
{21AD0890-4BF1-4E28-8C8F-D4350982D1E7}.UniversalGLDebug|Any CPU.ActiveCfg = UniversalGLDebug|Any CPU
{21AD0890-4BF1-4E28-8C8F-D4350982D1E7}.UniversalGLDebug|Any CPU.Build.0 = UniversalGLDebug|Any CPU
{21AD0890-4BF1-4E28-8C8F-D4350982D1E7}.UniversalGLDebug|ARM64.ActiveCfg = UniversalGLDebug|Any CPU
{21AD0890-4BF1-4E28-8C8F-D4350982D1E7}.UniversalGLDebug|ARM64.Build.0 = UniversalGLDebug|Any CPU
{21AD0890-4BF1-4E28-8C8F-D4350982D1E7}.UniversalGLDebug|x64.ActiveCfg = UniversalGLDebug|Any CPU
{21AD0890-4BF1-4E28-8C8F-D4350982D1E7}.UniversalGLDebug|x64.Build.0 = UniversalGLDebug|Any CPU
{21AD0890-4BF1-4E28-8C8F-D4350982D1E7}.UniversalGLDebug|x86.ActiveCfg = UniversalGLDebug|Any CPU
{21AD0890-4BF1-4E28-8C8F-D4350982D1E7}.UniversalGLDebug|x86.Build.0 = UniversalGLDebug|Any CPU
{21AD0890-4BF1-4E28-8C8F-D4350982D1E7}.UniversalGLRelease|Any CPU.ActiveCfg = UniversalGLRelease|Any CPU
{21AD0890-4BF1-4E28-8C8F-D4350982D1E7}.UniversalGLRelease|Any CPU.Build.0 = UniversalGLRelease|Any CPU
{21AD0890-4BF1-4E28-8C8F-D4350982D1E7}.UniversalGLRelease|ARM64.ActiveCfg = UniversalGLRelease|Any CPU
{21AD0890-4BF1-4E28-8C8F-D4350982D1E7}.UniversalGLRelease|ARM64.Build.0 = UniversalGLRelease|Any CPU
{21AD0890-4BF1-4E28-8C8F-D4350982D1E7}.UniversalGLRelease|x64.ActiveCfg = UniversalGLRelease|Any CPU
{21AD0890-4BF1-4E28-8C8F-D4350982D1E7}.UniversalGLRelease|x64.Build.0 = UniversalGLRelease|Any CPU
{21AD0890-4BF1-4E28-8C8F-D4350982D1E7}.UniversalGLRelease|x86.ActiveCfg = UniversalGLRelease|Any CPU
{21AD0890-4BF1-4E28-8C8F-D4350982D1E7}.UniversalGLRelease|x86.Build.0 = UniversalGLRelease|Any CPU
{21AD0890-4BF1-4E28-8C8F-D4350982D1E7}.WindowsDXDebug|Any CPU.ActiveCfg = WindowsDXDebug|Any CPU
{21AD0890-4BF1-4E28-8C8F-D4350982D1E7}.WindowsDXDebug|Any CPU.Build.0 = WindowsDXDebug|Any CPU
{21AD0890-4BF1-4E28-8C8F-D4350982D1E7}.WindowsDXDebug|ARM64.ActiveCfg = WindowsDXDebug|Any CPU
{21AD0890-4BF1-4E28-8C8F-D4350982D1E7}.WindowsDXDebug|ARM64.Build.0 = WindowsDXDebug|Any CPU
{21AD0890-4BF1-4E28-8C8F-D4350982D1E7}.WindowsDXDebug|x64.ActiveCfg = WindowsDXDebug|Any CPU
{21AD0890-4BF1-4E28-8C8F-D4350982D1E7}.WindowsDXDebug|x64.Build.0 = WindowsDXDebug|Any CPU
{21AD0890-4BF1-4E28-8C8F-D4350982D1E7}.WindowsDXDebug|x86.ActiveCfg = WindowsDXDebug|Any CPU
{21AD0890-4BF1-4E28-8C8F-D4350982D1E7}.WindowsDXDebug|x86.Build.0 = WindowsDXDebug|Any CPU
{21AD0890-4BF1-4E28-8C8F-D4350982D1E7}.WindowsDXRelease|Any CPU.ActiveCfg = WindowsDXRelease|Any CPU
{21AD0890-4BF1-4E28-8C8F-D4350982D1E7}.WindowsDXRelease|Any CPU.Build.0 = WindowsDXRelease|Any CPU
{21AD0890-4BF1-4E28-8C8F-D4350982D1E7}.WindowsDXRelease|ARM64.ActiveCfg = WindowsDXRelease|Any CPU
{21AD0890-4BF1-4E28-8C8F-D4350982D1E7}.WindowsDXRelease|ARM64.Build.0 = WindowsDXRelease|Any CPU
{21AD0890-4BF1-4E28-8C8F-D4350982D1E7}.WindowsDXRelease|x64.ActiveCfg = WindowsDXRelease|Any CPU
{21AD0890-4BF1-4E28-8C8F-D4350982D1E7}.WindowsDXRelease|x64.Build.0 = WindowsDXRelease|Any CPU
{21AD0890-4BF1-4E28-8C8F-D4350982D1E7}.WindowsDXRelease|x86.ActiveCfg = WindowsDXRelease|Any CPU
{21AD0890-4BF1-4E28-8C8F-D4350982D1E7}.WindowsDXRelease|x86.Build.0 = WindowsDXRelease|Any CPU
{21AD0890-4BF1-4E28-8C8F-D4350982D1E7}.WindowsGLDebug|Any CPU.ActiveCfg = WindowsGLDebug|Any CPU
{21AD0890-4BF1-4E28-8C8F-D4350982D1E7}.WindowsGLDebug|Any CPU.Build.0 = WindowsGLDebug|Any CPU
{21AD0890-4BF1-4E28-8C8F-D4350982D1E7}.WindowsGLDebug|ARM64.ActiveCfg = WindowsGLDebug|Any CPU
{21AD0890-4BF1-4E28-8C8F-D4350982D1E7}.WindowsGLDebug|ARM64.Build.0 = WindowsGLDebug|Any CPU
{21AD0890-4BF1-4E28-8C8F-D4350982D1E7}.WindowsGLDebug|x64.ActiveCfg = WindowsGLDebug|Any CPU
{21AD0890-4BF1-4E28-8C8F-D4350982D1E7}.WindowsGLDebug|x64.Build.0 = WindowsGLDebug|Any CPU
{21AD0890-4BF1-4E28-8C8F-D4350982D1E7}.WindowsGLDebug|x86.ActiveCfg = WindowsGLDebug|Any CPU
{21AD0890-4BF1-4E28-8C8F-D4350982D1E7}.WindowsGLDebug|x86.Build.0 = WindowsGLDebug|Any CPU
{21AD0890-4BF1-4E28-8C8F-D4350982D1E7}.WindowsGLRelease|Any CPU.ActiveCfg = WindowsGLRelease|Any CPU
{21AD0890-4BF1-4E28-8C8F-D4350982D1E7}.WindowsGLRelease|Any CPU.Build.0 = WindowsGLRelease|Any CPU
{21AD0890-4BF1-4E28-8C8F-D4350982D1E7}.WindowsGLRelease|ARM64.ActiveCfg = WindowsGLRelease|Any CPU
{21AD0890-4BF1-4E28-8C8F-D4350982D1E7}.WindowsGLRelease|ARM64.Build.0 = WindowsGLRelease|Any CPU
{21AD0890-4BF1-4E28-8C8F-D4350982D1E7}.WindowsGLRelease|x64.ActiveCfg = WindowsGLRelease|Any CPU
{21AD0890-4BF1-4E28-8C8F-D4350982D1E7}.WindowsGLRelease|x64.Build.0 = WindowsGLRelease|Any CPU
{21AD0890-4BF1-4E28-8C8F-D4350982D1E7}.WindowsGLRelease|x86.ActiveCfg = WindowsGLRelease|Any CPU
{21AD0890-4BF1-4E28-8C8F-D4350982D1E7}.WindowsGLRelease|x86.Build.0 = WindowsGLRelease|Any CPU
{21AD0890-4BF1-4E28-8C8F-D4350982D1E7}.WindowsXNADebug|Any CPU.ActiveCfg = WindowsXNADebug|Any CPU
{21AD0890-4BF1-4E28-8C8F-D4350982D1E7}.WindowsXNADebug|Any CPU.Build.0 = WindowsXNADebug|Any CPU
{21AD0890-4BF1-4E28-8C8F-D4350982D1E7}.WindowsXNADebug|ARM64.ActiveCfg = WindowsXNADebug|Any CPU
{21AD0890-4BF1-4E28-8C8F-D4350982D1E7}.WindowsXNADebug|ARM64.Build.0 = WindowsXNADebug|Any CPU
{21AD0890-4BF1-4E28-8C8F-D4350982D1E7}.WindowsXNADebug|x64.ActiveCfg = WindowsXNADebug|Any CPU
{21AD0890-4BF1-4E28-8C8F-D4350982D1E7}.WindowsXNADebug|x64.Build.0 = WindowsXNADebug|Any CPU
{21AD0890-4BF1-4E28-8C8F-D4350982D1E7}.WindowsXNADebug|x86.ActiveCfg = WindowsXNADebug|Any CPU
{21AD0890-4BF1-4E28-8C8F-D4350982D1E7}.WindowsXNADebug|x86.Build.0 = WindowsXNADebug|Any CPU
{21AD0890-4BF1-4E28-8C8F-D4350982D1E7}.WindowsXNARelease|Any CPU.ActiveCfg = WindowsXNARelease|Any CPU
{21AD0890-4BF1-4E28-8C8F-D4350982D1E7}.WindowsXNARelease|Any CPU.Build.0 = WindowsXNARelease|Any CPU
{21AD0890-4BF1-4E28-8C8F-D4350982D1E7}.WindowsXNARelease|ARM64.ActiveCfg = WindowsXNARelease|Any CPU
{21AD0890-4BF1-4E28-8C8F-D4350982D1E7}.WindowsXNARelease|ARM64.Build.0 = WindowsXNARelease|Any CPU
{21AD0890-4BF1-4E28-8C8F-D4350982D1E7}.WindowsXNARelease|x64.ActiveCfg = WindowsXNARelease|Any CPU
{21AD0890-4BF1-4E28-8C8F-D4350982D1E7}.WindowsXNARelease|x64.Build.0 = WindowsXNARelease|Any CPU
{21AD0890-4BF1-4E28-8C8F-D4350982D1E7}.WindowsXNARelease|x86.ActiveCfg = WindowsXNARelease|Any CPU
{21AD0890-4BF1-4E28-8C8F-D4350982D1E7}.WindowsXNARelease|x86.Build.0 = WindowsXNARelease|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
1 change: 1 addition & 0 deletions DXMainClient/DXGUI/GameClass.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,7 @@ private IServiceProvider BuildServiceProvider(WindowManager windowManager)
.AddTransientXnaControl<XNAClientButton>()
.AddTransientXnaControl<XNAClientCheckBox>()
.AddTransientXnaControl<XNAClientDropDown>()
.AddTransientXnaControl<XNAClientScrollPanel>()
.AddTransientXnaControl<XNALinkButton>()
.AddTransientXnaControl<XNAExtraPanel>()
.AddTransientXnaControl<XNACheckBox>()
Expand Down
Binary file added DXMainClient/Resources/DTA/Default Theme/hsbBackground.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added DXMainClient/Resources/DTA/Default Theme/hsbLeftArrow.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added DXMainClient/Resources/DTA/Default Theme/hsbMiddle.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added DXMainClient/Resources/DTA/Default Theme/hsbRightArrow.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added DXMainClient/Resources/DTA/Default Theme/hsbThumbLeft.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added DXMainClient/Resources/DTA/Default Theme/hsbThumbRight.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 16 additions & 0 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,4 +85,20 @@
<ItemGroup>
<CompilerVisibleProperty Include="RootNamespace" />
</ItemGroup>

<PropertyGroup>
<XNAUIRoot>$(MSBuildThisFileDirectory)Rampastring.XNAUI</XNAUIRoot>
</PropertyGroup>

<ItemGroup Condition="$(DefineConstants.Contains('XNA'))">
<Reference Include="Microsoft.Xna.Framework">
<HintPath>$(XNAUIRoot)\References\XNA\Microsoft.Xna.Framework.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Xna.Framework.Game">
<HintPath>$(XNAUIRoot)\References\XNA\Microsoft.Xna.Framework.Game.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Xna.Framework.Graphics">
<HintPath>$(XNAUIRoot)\References\XNA\Microsoft.Xna.Framework.Graphics.dll</HintPath>
</Reference>
</ItemGroup>
</Project>
1 change: 1 addition & 0 deletions Rampastring.XNAUI
Open in desktop
Submodule Rampastring.XNAUI added at 32f646
Loading
Loading