From 3e570b89a7d20d2d4875d0785113a172ec9530a4 Mon Sep 17 00:00:00 2001 From: LiRuoChen <571244399@qq.com> Date: Mon, 22 Sep 2025 16:03:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=81=E8=AE=B8xeric=E7=9B=B4=E7=BA=BF?= =?UTF-8?q?=E5=B8=83=E5=B1=80=E5=9C=A8=E5=90=8D=E5=8D=95=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E4=B8=8B=E5=8F=AF=E9=80=89=E5=BF=BD=E7=95=A5=E6=88=90=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...r.cs => XericHorizontalOrVerticalLayoutGroupEditor.cs} | 8 +------- ...=> XericHorizontalOrVerticalLayoutGroupEditor.cs.meta} | 0 .../XericHorizontalOrVerticalLayoutGroup.cs | 3 ++- 3 files changed, 3 insertions(+), 8 deletions(-) rename Editor/OverrideLayout/{XericVerticalLayoutGroupEditor.cs => XericHorizontalOrVerticalLayoutGroupEditor.cs} (90%) rename Editor/OverrideLayout/{XericVerticalLayoutGroupEditor.cs.meta => XericHorizontalOrVerticalLayoutGroupEditor.cs.meta} (100%) 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)