Updated ReactiveUI

Added order to render element ctors
This commit is contained in:
Robert committed 2021-12-30 23:33:26 +01:00
1 parent 6569558df4
commit 34757716aa
46 files changed
+838 -370

No files matched your search

+3 -2
View File
@@ -22,7 +22,8 @@ namespace Artemis.Core
/// </summary>
/// <param name="parent">The parent of the folder</param>
/// <param name="name">The name of the folder</param>
public Folder(ProfileElement parent, string name) : base(parent.Profile)
/// <param name="order">The order where to place the child (0-based), defaults to the end of the collection</param>
public Folder(ProfileElement parent, string name, int order) : base(parent.Profile)
{
FolderEntity = new FolderEntity();
EntityId = Guid.NewGuid();
@@ -31,7 +32,7 @@ namespace Artemis.Core
Profile = Parent.Profile;
Name = name;
Parent.AddChild(this);
Parent.AddChild(this, order);
}
/// <summary>
+3 -2
View File
@@ -29,7 +29,8 @@ namespace Artemis.Core
/// </summary>
/// <param name="parent">The parent of the layer</param>
/// <param name="name">The name of the layer</param>
public Layer(ProfileElement parent, string name) : base(parent.Profile)
/// <param name="order">The order where to place the child (0-based), defaults to the end of the collection</param>
public Layer(ProfileElement parent, string name, int order) : base(parent.Profile)
{
LayerEntity = new LayerEntity();
EntityId = Guid.NewGuid();
@@ -47,7 +48,7 @@ namespace Artemis.Core
Adapter = new LayerAdapter(this);
Initialize();
Parent.AddChild(this, 0);
Parent.AddChild(this, order);
}
/// <summary>
+1 -1
View File
@@ -198,7 +198,7 @@ namespace Artemis.Core
FolderEntity? rootFolder = ProfileEntity.Folders.FirstOrDefault(f => f.ParentId == EntityId);
if (rootFolder == null)
{
Folder _ = new(this, "Root folder");
Folder _ = new(this, "Root folder", 0);
}
else
{
+3
View File
@@ -44,6 +44,9 @@ namespace Artemis.Core
/// <param name="extraArgs">A list of extra arguments to pass to Artemis when restarting</param>
public static void Restart(bool elevate, TimeSpan delay, params string[] extraArgs)
{
if (!OperatingSystem.IsWindows() && elevate)
throw new ArtemisCoreException("Elevation on non-Windows platforms is not supported.");
OnRestartRequested(new RestartEventArgs(elevate, delay, extraArgs.ToList()));
}