fix: screen resolution in full screen mode is incorrect

mob-sakai · Oct 1, 2020 · 39e3084 · 39e3084
1 parent e3684bb
commit 39e3084
Showing 1 changed file with 17 additions and 6 deletions.
diff --git a/Packages/SoftMaskForUGUI/Scripts/SoftMask.cs b/Packages/SoftMaskForUGUI/Scripts/SoftMask.cs
@@ -675,13 +675,24 @@ private void UpdateMaskTexture()
         private static void GetDesamplingSize(DesamplingRate rate, out int w, out int h)
         {
 #if UNITY_EDITOR
-            var res = UnityEditor.UnityStats.screenRes.Split('x');
-            w = Mathf.Max(64, int.Parse(res[0]));
-            h = Mathf.Max(64, int.Parse(res[1]));
-#else
-			w = Screen.width;
-			h = Screen.height;
+            if (!Application.isPlaying)
+            {
+                var res = UnityEditor.UnityStats.screenRes.Split('x');
+                w = Mathf.Max(64, int.Parse(res[0]));
+                h = Mathf.Max(64, int.Parse(res[1]));
+            }
+            else
 #endif
+            if (Screen.fullScreenMode == FullScreenMode.Windowed)
+            {
+                w = Screen.width;
+                h = Screen.height;
+            }
+            else
+            {
+                w = Screen.currentResolution.width;
+                h = Screen.currentResolution.height;
+            }
 
             if (rate == DesamplingRate.None)
                 return;