From 7bf7291ae8ddc8b290e1202d5d05016bc32e4a0e Mon Sep 17 00:00:00 2001
From: PopSlime <popslime@qq.com>
Date: Sat, 8 Oct 2022 14:27:51 +0800
Subject: [PATCH] Fix AspectRatioLayoutElement min axis length.

---
 .../Common/Unity/UI/AspectRatioLayoutElement.cs    | 14 ++++----------
 Assets/Cryville/Common/Unity/UI/DockLayoutGroup.cs |  1 -
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/Assets/Cryville/Common/Unity/UI/AspectRatioLayoutElement.cs b/Assets/Cryville/Common/Unity/UI/AspectRatioLayoutElement.cs
index 9bc1ee7..fb81946 100644
--- a/Assets/Cryville/Common/Unity/UI/AspectRatioLayoutElement.cs
+++ b/Assets/Cryville/Common/Unity/UI/AspectRatioLayoutElement.cs
@@ -31,9 +31,7 @@ namespace Cryville.Common.Unity.UI {
 
 		public float minWidth {
 			get {
-				return m_isVertical
-					? (transform as RectTransform).rect.width
-					: (transform as RectTransform).rect.height * m_aspectRatio;
+				return m_isVertical ? 0 : (transform as RectTransform).rect.height * m_aspectRatio;
 			}
 		}
 		public float preferredWidth { get { return minWidth; } }
@@ -41,9 +39,7 @@ namespace Cryville.Common.Unity.UI {
 
 		public float minHeight {
 			get {
-				return m_isVertical
-					? (transform as RectTransform).rect.width / m_aspectRatio
-					: (transform as RectTransform).rect.height;
+				return m_isVertical ? (transform as RectTransform).rect.width / m_aspectRatio : 0;
 			}
 		}
 		public float preferredHeight { get { return minHeight; } }
@@ -61,7 +57,7 @@ namespace Cryville.Common.Unity.UI {
 		}
 
 		protected override void OnDisable() {
-			LayoutRebuilder.MarkLayoutForRebuild(transform as RectTransform);
+			SetDirty();
 			base.OnDisable();
 		}
 
@@ -80,10 +76,8 @@ namespace Cryville.Common.Unity.UI {
 			SetDirty();
 		}
 
-#pragma warning disable IDE0051
-		new void OnValidate() {
+		protected override void OnValidate() {
 			SetDirty();
 		}
-#pragma warning restore IDE0051
 	}
 }
diff --git a/Assets/Cryville/Common/Unity/UI/DockLayoutGroup.cs b/Assets/Cryville/Common/Unity/UI/DockLayoutGroup.cs
index f95e3fc..8a75c18 100644
--- a/Assets/Cryville/Common/Unity/UI/DockLayoutGroup.cs
+++ b/Assets/Cryville/Common/Unity/UI/DockLayoutGroup.cs
@@ -1,5 +1,4 @@
 using UnityEngine;
-using System.Collections;
 using UnityEngine.UI;
 
 namespace Cryville.Common.Unity.UI {