From 12987bcc51f239f1b930755e3dd08dcbf02b940f Mon Sep 17 00:00:00 2001
From: lukeIam <2lukeiam@gmail.com>
Date: Fri, 7 Sep 2018 17:44:11 +0200
Subject: [PATCH] Fix: Controllers contain no data

---
 Vocaluxe.UI/BasicElements/Button/CUiElementButton.cs | 7 ++++++-
 Vocaluxe.UI/BasicElements/Text/CUiElementText.cs     | 7 ++++++-
 Vocaluxe.UI/Screens/ScreenMain/CUiScreenMain.cs      | 7 ++++++-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/Vocaluxe.UI/BasicElements/Button/CUiElementButton.cs b/Vocaluxe.UI/BasicElements/Button/CUiElementButton.cs
index 32ec20a1..db313403 100644
--- a/Vocaluxe.UI/BasicElements/Button/CUiElementButton.cs
+++ b/Vocaluxe.UI/BasicElements/Button/CUiElementButton.cs
@@ -5,9 +5,14 @@ namespace Vocaluxe.UI.BasicElements.Button
 {
     public class CUiElementButton:CUiElement
     {
-        public CControllerElementButton Controller => new CControllerElementButton();
+        public CControllerElementButton Controller { get; private set; }
         public override CController BasicController => Controller;
 
+        public CUiElementButton()
+        {
+            Controller = new CControllerElementButton();
+        }
+
         public static CUiElementButton CreateInstance(Dictionary<string, string> properties, IEnumerable<(CUiElement, string)> children)
         {
             return CUiElement.CreateInstance<CUiElementButton>(properties, children);
diff --git a/Vocaluxe.UI/BasicElements/Text/CUiElementText.cs b/Vocaluxe.UI/BasicElements/Text/CUiElementText.cs
index 62e2d184..41abe4b3 100644
--- a/Vocaluxe.UI/BasicElements/Text/CUiElementText.cs
+++ b/Vocaluxe.UI/BasicElements/Text/CUiElementText.cs
@@ -5,9 +5,14 @@ namespace Vocaluxe.UI.BasicElements.Text
 {
     public class CUiElementText:CUiElement
     {
-        public CControllerElementText Controller => new CControllerElementText();
+        public CControllerElementText Controller { get; private set; }
         public override CController BasicController => Controller;
 
+        public CUiElementText()
+        {
+            Controller = new CControllerElementText();
+        }
+
         public static CUiElementText CreateInstance(Dictionary<string, string> properties, IEnumerable<(CUiElement uiElement, string bindingId)> children)
         {
             var instance = CUiElement.CreateInstance<CUiElementText>(properties, children);
diff --git a/Vocaluxe.UI/Screens/ScreenMain/CUiScreenMain.cs b/Vocaluxe.UI/Screens/ScreenMain/CUiScreenMain.cs
index dfead445..311de1f9 100644
--- a/Vocaluxe.UI/Screens/ScreenMain/CUiScreenMain.cs
+++ b/Vocaluxe.UI/Screens/ScreenMain/CUiScreenMain.cs
@@ -5,9 +5,14 @@ namespace Vocaluxe.UI.Screens.ScreenMain
 {
     public class CUiScreenMain:CUiScreen
     {
-        public CControllerScreenMain Controller => new CControllerScreenMain();
+        public CControllerScreenMain Controller { get; private set; }
         public override CController BasicController => Controller;
 
+        public CUiScreenMain()
+        {
+            Controller = new CControllerScreenMain();
+        }
+
         public static CUiScreen CreateInstance(Dictionary<string, string> properties, IEnumerable<(CUiElement uiElement, string bindingId)> children)
         {
             return CUiElement.CreateInstance<CUiScreenMain>(properties, children);