Merge branch 'development' into development

This commit is contained in:
Florian Zevedei
2023-06-04 17:29:28 +02:00
committed by GitHub
2 changed files with 58 additions and 10 deletions
+10 -10
View File
@@ -26,16 +26,6 @@ public class FormBase : IDisposable
public EventHandlerList Events = new();
public FormBase()
{
Controls = new List<ControlBase>();
}
public FormBase(MessageClient client) : this()
{
Client = client;
}
public NavigationController NavigationController { get; set; }
public DeviceSession Device { get; set; }
@@ -49,6 +39,16 @@ public class FormBase : IDisposable
public List<ControlBase> Controls { get; set; }
public FormBase()
{
Controls = new List<ControlBase>();
}
public FormBase(MessageClient client) : this()
{
Client = client;
}
/// <summary>
/// Cleanup
/// </summary>