Merge branch 'main' into fix/remove-directive-2019-3

mackysoft · web-flow · commit 6d39db142a04 · 2024-10-26T21:28:35.000+09:00
diff --git a/Assets/MackySoft/MackySoft.SerializeReferenceExtensions/Editor/SubclassSelectorDrawer.cs b/Assets/MackySoft/MackySoft.SerializeReferenceExtensions/Editor/SubclassSelectorDrawer.cs
@@ -56,7 +56,7 @@ public override void OnGUI (Rect position, SerializedProperty property, GUIConte
 					Rect foldoutRect = new Rect(position);
 					foldoutRect.height = EditorGUIUtility.singleLineHeight;
 
-#if UNITY_2022_2_OR_NEWER
+#if UNITY_2022_2
 					// NOTE: Position x must be adjusted.
 					// FIXME: Is there a more essential solution...?
 					foldoutRect.x -= 12;
@@ -197,4 +197,4 @@ public override float GetPropertyHeight (SerializedProperty property,GUIContent
 		}
 
 	}
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public override void OnGUI (Rect position, SerializedProperty property, GUIConte`
`56`	`56`	`Rect foldoutRect = new Rect(position);`
`57`	`57`	`foldoutRect.height = EditorGUIUtility.singleLineHeight;`
`58`	`58`
`59`		`-#if UNITY_2022_2_OR_NEWER`
	`59`	`+#if UNITY_2022_2`
`60`	`60`	`// NOTE: Position x must be adjusted.`
`61`	`61`	`// FIXME: Is there a more essential solution...?`
`62`	`62`	`foldoutRect.x -= 12;`
`@@ -197,4 +197,4 @@ public override float GetPropertyHeight (SerializedProperty property,GUIContent`
`197`	`197`	`}`
`198`	`198`
`199`	`199`	`}`
`200`		`-}`
	`200`	`+}`