From 128822b405f17c8f7211223dfb9c69a480dac116 Mon Sep 17 00:00:00 2001
From: Firerise9402 <90978630+Firerise9402@users.noreply.github.com>
Date: Mon, 21 Aug 2023 13:18:31 -0400
Subject: [PATCH] merge to master

---
 Assets/Scripts/StaticCamera.cs | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/Assets/Scripts/StaticCamera.cs b/Assets/Scripts/StaticCamera.cs
index c0f79a799..1f97f8e2a 100644
--- a/Assets/Scripts/StaticCamera.cs
+++ b/Assets/Scripts/StaticCamera.cs
@@ -16,8 +16,8 @@ namespace HeavenStudio
     {
         [SerializeField] RectTransform canvas;
         [SerializeField] GameObject overlayView;
+        [SerializeField] RectTransform overlayCanvas;
         [SerializeField] RectTransform parentView;
-        [SerializeField] UnityEngine.UI.CanvasScaler parent;
 
         [SerializeField] Image ambientBg;
         [SerializeField] GameObject ambientBgGO;
@@ -134,16 +134,20 @@ namespace HeavenStudio
             UpdateTilePan();
             UpdateScreenTile();
             
-            if(fitToScreen) parent.screenMatchMode = CanvasScaler.ScreenMatchMode.MatchWidthOrHeight;
-            else if (!fitToScreen) parent.screenMatchMode = CanvasScaler.ScreenMatchMode.Expand;
             canvas.localPosition = pan;
             canvas.eulerAngles = new Vector3(0, 0, rotation);
-            letterboxMask.localScale = letterbox;
-            scaleInv = scale;
-            scaleInv.x /= letterbox.x;
-            scaleInv.y /= letterbox.y;
-            scaleInv.z /= letterbox.z;
-            canvas.localScale = scaleInv;
+            //letterboxMask.localScale = letterbox;
+            if(fitToScreen)
+            {
+                letterboxMask.localScale = new Vector3(parentView.sizeDelta.x/16, parentView.sizeDelta.y/9, 1);
+                overlayCanvas.localScale = new Vector3(parentView.sizeDelta.x/16, parentView.sizeDelta.y/9, 1);
+            }
+            else 
+            {
+                letterboxMask.localScale = new Vector3(1, 1, 1);
+                overlayCanvas.localScale = new Vector3(1, 1, 1);
+            }
+            canvas.localScale = scale;
             viewportTexture.uvRect = new Rect(tilePan.x, tilePan.y, screenTile.x, screenTile.y);
         }