diff --git a/Editor/OverrideLayout/XericVerticalLayoutGroupEditor.cs b/Editor/OverrideLayout/XericHorizontalOrVerticalLayoutGroupEditor.cs similarity index 90% rename from Editor/OverrideLayout/XericVerticalLayoutGroupEditor.cs rename to Editor/OverrideLayout/XericHorizontalOrVerticalLayoutGroupEditor.cs index c0da9bc..23e82eb 100644 --- a/Editor/OverrideLayout/XericVerticalLayoutGroupEditor.cs +++ b/Editor/OverrideLayout/XericHorizontalOrVerticalLayoutGroupEditor.cs @@ -43,13 +43,7 @@ namespace XericUIEditor.OverrideLayout EditorGUILayout.PropertyField(whiteList_list, EditorGUIUtility.TrTextContent("White List")); EditorGUI.indentLevel--; } - else - { - EditorGUI.indentLevel++; - EditorGUILayout.PropertyField(ignoreInvisible, true); - EditorGUI.indentLevel--; - } - + EditorGUILayout.PropertyField(ignoreInvisible, true); serializedObject.ApplyModifiedProperties(); } } diff --git a/Editor/OverrideLayout/XericVerticalLayoutGroupEditor.cs.meta b/Editor/OverrideLayout/XericHorizontalOrVerticalLayoutGroupEditor.cs.meta similarity index 100% rename from Editor/OverrideLayout/XericVerticalLayoutGroupEditor.cs.meta rename to Editor/OverrideLayout/XericHorizontalOrVerticalLayoutGroupEditor.cs.meta diff --git a/Runtime/OverrideLayout/XericHorizontalOrVerticalLayoutGroup.cs b/Runtime/OverrideLayout/XericHorizontalOrVerticalLayoutGroup.cs index a957dc9..0bb5fc0 100644 --- a/Runtime/OverrideLayout/XericHorizontalOrVerticalLayoutGroup.cs +++ b/Runtime/OverrideLayout/XericHorizontalOrVerticalLayoutGroup.cs @@ -92,7 +92,8 @@ namespace XericUI.OverrideLayout { if (!enableListScreening) return layoutIgnoreInactive && !target.gameObject.activeInHierarchy; - return blackListMode ? BlackListContains(target) : !WhiteListContains(target); + return (blackListMode ? BlackListContains(target) : !WhiteListContains(target)) || + (layoutIgnoreInactive && !target.gameObject.activeInHierarchy); } protected bool WhiteListContains(RectTransform target)