Canvas always enabled; loading flag

DMagic1 · Aug 1, 2018 · d56f3d0 · d56f3d0
1 parent e96b658
commit d56f3d0
Showing 1 changed file with 9 additions and 12 deletions.
diff --git a/Source/ContractsWindow.Unity/Unity/CW_ProgressPanel.cs b/Source/ContractsWindow.Unity/Unity/CW_ProgressPanel.cs
@@ -64,22 +64,20 @@ public class CW_ProgressPanel : MonoBehaviour
 		private List<CW_StandardNode> standardNodes = new List<CW_StandardNode>();
 		private List<CW_BodyNode> bodyNodes = new List<CW_BodyNode>();
 
-        private Canvas panelCanvas;
+        private bool loaded;
 
-        private void Awake()
+        public bool Loaded
         {
-            panelCanvas = GetComponent<Canvas>();
+            get { return loaded; }
         }
-
-        public IEnumerator GeneratePanel(IProgressPanel panel, bool active)
+        
+        public IEnumerator GeneratePanel(IProgressPanel panel)
         {
             if (panel == null)
                 yield break;
 
             gameObject.SetActive(true);
-
-            panelCanvas.enabled = false;
-
+
             panelInterface = panel;
 
             if (panelInterface.GetIntervalNodes != null)
@@ -138,10 +136,9 @@ public IEnumerator GeneratePanel(IProgressPanel panel, bool active)
 
             FinishPanel();
 
-            panelCanvas.enabled = true;
-
-            if (gameObject.activeSelf != active)
-                gameObject.SetActive(active);
+            loaded = true;
+
+            gameObject.SetActive(false);
         }
 
         private void FinishPanel()