fix: Leave UI when screensettings is none

jcs090218 · Jul 16, 2024 · 817e6fc · 817e6fc
1 parent fa4a95d
commit 817e6fc
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 5 deletions.
diff --git a/Assets/JCSUnity/Scripts/Settings/JCS_ScreenSettings.cs b/Assets/JCSUnity/Scripts/Settings/JCS_ScreenSettings.cs
@@ -175,6 +175,7 @@ public bool ShouldSpawnResizablePanels()
         {
             switch (SCREEN_TYPE)
             {
+                case JCS_ScreenType.NONE:
                 case JCS_ScreenType.FIT_ALL:
                 case JCS_ScreenType.MIXED:
                     return false;
@@ -195,6 +196,15 @@ public bool IsResponsive()
             return false;
         }
 
+        /// <summary>
+        /// Return true if current screen type is none.
+        /// </summary>
+        /// <returns></returns>
+        public bool IsNone()
+        {
+            return SCREEN_TYPE == JCS_ScreenType.NONE;
+        }
+
         /// <summary>
         /// Return the starting screen size by the current screen type.
         /// </summary>

diff --git a/Assets/JCSUnity/Scripts/UI/GameWindow/JCS_BaseDialogueObject.cs b/Assets/JCSUnity/Scripts/UI/GameWindow/JCS_BaseDialogueObject.cs
@@ -167,7 +167,7 @@ protected void SetParentObjectByMode()
             Transform parentObject;
 
             // if is Resize UI is enable than add Dialogue under resize ui transform
-            if (JCS_UISettings.instance.RESIZE_UI)
+            if (JCS_UISettings.instance.RESIZE_UI && !JCS_ScreenSettings.instance.IsNone())
                 parentObject = resizeUI.transform;
             // Else we add it directly under the Canvas
             else

diff --git a/Assets/JCSUnity/Scripts/UI/JCS_Canvas.cs b/Assets/JCSUnity/Scripts/UI/JCS_Canvas.cs
@@ -76,7 +76,7 @@ private void Awake()
             this.mAppRect = this.GetComponent<RectTransform>();
             this.mCanvas = this.GetComponent<Canvas>();
 
-            if (JCS_UISettings.instance.RESIZE_UI)
+            if (JCS_UISettings.instance.RESIZE_UI && !JCS_ScreenSettings.instance.IsNone())
             {
                 // resizable UI in order to resize the UI correctly
                 mResizeUI = JCS_Util.Instantiate(RESIZE_UI_PATH).GetComponent<JCS_ResizeUI>();
@@ -93,7 +93,7 @@ private void Awake()
 
         private void Start()
         {
-            if (JCS_UISettings.instance.RESIZE_UI)
+            if (JCS_UISettings.instance.RESIZE_UI && !JCS_ScreenSettings.instance.IsNone())
             {
                 if (mResizeUI == null)
                     return;

diff --git a/Assets/JCSUnity/Scripts/UI/JCS_PanelRoot.cs b/Assets/JCSUnity/Scripts/UI/JCS_PanelRoot.cs
@@ -42,8 +42,11 @@ protected override void Awake()
         {
             base.Awake();
 
-            // NOTE: not sure is this the correct position for the code or not.
-            DoResize();
+            if (!JCS_ScreenSettings.instance.IsNone())
+            {
+                // NOTE: not sure is this the correct position for the code or not.
+                DoResize();
+            }
         }
 
         protected override void Start()