feat(ShaderBake): 细节面板六个板块改用 Foldout 折叠

原来每个板块标题是个带复选框的 Toggle:功能上能折,但看着像"启用开关",
不容易发现是在折叠。现在换成 Foldout,标题左侧的三角就是状态,整条可点、
悬停有底色,六块各自独立折叠;全局参数仍默认折叠。
组内内容的左右留边挪到 .unity-foldout__content 上,BindSections/Collapsible 一并删掉。
This commit is contained in:
2026-11-07 11:27:39 +08:00
parent 0432c51678
commit 8262d5a5b7
5 changed files with 28 additions and 65 deletions
@@ -174,7 +174,6 @@ namespace XericUI.ShaderBake.Editor
BuildGlobalTable();
BindFaceGrid();
BindToolbar();
BindSections();
BindSettings();
BindDetailSplit();
@@ -414,33 +413,6 @@ namespace XericUI.ShaderBake.Editor
return "BakedImage";
}
// ── 分组折叠 ────────────────────────────────────────────
private void BindSections()
{
// 头部是 Toggle(名字带 -head),外层同名容器只是分组壳,别拿它去 Q<Toggle>
Collapsible("sec-source-head", "sec-source-body");
Collapsible("sec-output-head", "sec-output-body");
Collapsible("sec-surface-head", "sec-surface-body");
Collapsible("sec-camera-head", "sec-camera-body");
Collapsible("sec-globals-head", "sec-globals-body");
Collapsible("sec-props-head", "sec-props-body");
}
private void Collapsible(string headName, string bodyName)
{
Toggle head = rootVisualElement.Q<Toggle>(headName);
VisualElement body = rootVisualElement.Q<VisualElement>(bodyName);
if (head == null || body == null)
{
Debug.LogError("[ShaderBake] 分组节点不成对:" + headName + " / " + bodyName);
return;
}
body.style.display = head.value ? DisplayStyle.Flex : DisplayStyle.None;
head.RegisterValueChangedCallback(evt =>
body.style.display = evt.newValue ? DisplayStyle.Flex : DisplayStyle.None);
}
// ── 输入源 ──────────────────────────────────────────────
private void BindSettings()
+14 -6
View File
@@ -171,19 +171,27 @@
.section {
border-bottom-width: 1px;
border-bottom-color: rgb(52, 52, 52);
padding-top: 4px;
padding-top: 2px;
padding-bottom: 6px;
}
.section-head {
/* 折叠头:Foldout 自带的三角就是状态指示,整条都能点,悬停给一点底色 */
.section > .unity-foldout__toggle {
font-size: 12px;
margin-left: 6px;
margin-bottom: 2px;
color: rgb(225, 225, 225);
margin-left: 2px;
margin-bottom: 2px;
padding: 2px 4px;
border-radius: 3px;
}
.section-body {
padding-left: 8px;
.section > .unity-foldout__toggle:hover {
background-color: rgba(255, 255, 255, 0.07);
}
/* 内容左右留边:子项不该贴着三角和面板边 */
.section > .unity-foldout__content {
padding-left: 10px;
padding-right: 8px;
}
+12 -30
View File
@@ -58,9 +58,7 @@
<ui:VisualElement name="detail-content" class="detail-content">
<!-- 输入源 -->
<ui:VisualElement name="sec-source" class="section">
<ui:Toggle name="sec-source-head" label="输入源" value="true" class="section-head" />
<ui:VisualElement name="sec-source-body" class="section-body">
<ui:Foldout name="sec-source" text="输入源" value="true" class="section">
<x:ObjectField name="src-shader" label="Shader" class="field-full" />
<x:ObjectField name="src-material" label="Material" class="field-full" />
<ui:Label name="src-note" class="field-note" text="未指定" />
@@ -68,13 +66,10 @@
<ui:Button name="src-apply" text="写回原材质" class="field-half" />
<ui:Button name="src-revert" text="丢弃改动" class="field-half" />
</ui:VisualElement>
</ui:VisualElement>
</ui:VisualElement>
</ui:Foldout>
<!-- 输出目标 -->
<ui:VisualElement name="sec-output" class="section">
<ui:Toggle name="sec-output-head" label="输出" value="true" class="section-head" />
<ui:VisualElement name="sec-output-body" class="section-body">
<ui:Foldout name="sec-output" text="输出" value="true" class="section">
<ui:VisualElement class="field-row">
<ui:DropdownField name="out-preset" label="预设" class="field-half" />
<ui:Button name="out-fit-aspect" text="匹配面片比例" class="field-half" />
@@ -92,13 +87,10 @@
<ui:Toggle name="out-hdr" label="HDR" class="field-toggle" />
<ui:Toggle name="out-srgb" label="sRGB 存储" class="field-toggle" />
<ui:Toggle name="out-flip" label="翻转 Y" class="field-toggle" />
</ui:VisualElement>
</ui:VisualElement>
</ui:Foldout>
<!-- 面片 -->
<ui:VisualElement name="sec-surface" class="section">
<ui:Toggle name="sec-surface-head" label="面片" value="true" class="section-head" />
<ui:VisualElement name="sec-surface-body" class="section-body">
<ui:Foldout name="sec-surface" text="面片" value="true" class="section">
<xer:EnumField name="surf-kind" label="种类" class="field-full" />
<ui:VisualElement class="field-row">
<xer:FloatField name="surf-size-x" label="宽" class="field-half" />
@@ -169,13 +161,10 @@
<ui:Button name="surf-flip-u" text="U镜像" class="field-third" />
<ui:Button name="surf-flip-v" text="V镜像" class="field-third" />
</ui:VisualElement>
</ui:VisualElement>
</ui:VisualElement>
</ui:Foldout>
<!-- 离屏相机 -->
<ui:VisualElement name="sec-camera" class="section">
<ui:Toggle name="sec-camera-head" label="相机" value="true" class="section-head" />
<ui:VisualElement name="sec-camera-body" class="section-body">
<ui:Foldout name="sec-camera" text="相机" value="true" class="section">
<ui:Toggle name="cam-ortho" label="正交" class="field-toggle" />
<xer:FloatField name="cam-ortho-size" label="正交半高" class="field-full" />
<xer:FloatField name="cam-fov" label="视野角" class="field-full" />
@@ -200,30 +189,23 @@
<ui:Button name="cam-selftest" text="管线自检" class="field-half" />
</ui:VisualElement>
<ui:Label name="selftest-note" class="field-note" text="自检" />
</ui:VisualElement>
</ui:VisualElement>
</ui:Foldout>
<!-- 全局参数:离屏渲染没有相机流程,光照/环境这类引擎全局量要自己补 -->
<ui:VisualElement name="sec-globals" class="section">
<ui:Toggle name="sec-globals-head" label="全局参数(光照 / 环境)" value="false" class="section-head" />
<ui:VisualElement name="sec-globals-body" class="section-body">
<ui:Foldout name="sec-globals" text="全局参数(光照 / 环境)" value="false" class="section">
<ui:Label name="globals-note" class="field-note" text="渲染时注入,渲染后还原" />
<ui:VisualElement class="field-row">
<ui:Button name="globals-detect" text="扫描 Shader" class="field-half" />
<ui:Button name="globals-presets" text="加入常用预设" class="field-half" />
</ui:VisualElement>
<ui:VisualElement name="globals-rows" class="props-rows" />
</ui:VisualElement>
</ui:VisualElement>
</ui:Foldout>
<!-- 材质属性表:行来自 BakeShaderPropertyRow.uxml -->
<ui:VisualElement name="sec-props" class="section">
<ui:Toggle name="sec-props-head" label="材质属性" value="true" class="section-head" />
<ui:VisualElement name="sec-props-body" class="section-body">
<ui:Foldout name="sec-props" text="材质属性" value="true" class="section">
<ui:VisualElement name="props-rows" class="props-rows" />
<ui:Label name="props-note" class="field-note" text="未指定 shader" />
</ui:VisualElement>
</ui:VisualElement>
</ui:Foldout>
</ui:VisualElement>
</ui:ScrollView>