Refactor XCUI editor module layout

tests/UI/Editor/integration/shell/enum_field_basic/main.cpp

@@ -1,11 +1,11 @@
-#ifndef NOMINMAX
+#ifndef NOMINMAX
 #define NOMINMAX
 #endif
 
-#include <XCEditor/Core/UIEditorEnumFieldInteraction.h>
-#include <XCEditor/Core/UIEditorTheme.h>
-#include <XCEditor/Widgets/UIEditorEnumField.h>
-#include <XCEditor/Widgets/UIEditorMenuPopup.h>
+#include <XCEditor/Fields/UIEditorEnumFieldInteraction.h>
+#include <XCEditor/Foundation/UIEditorTheme.h>
+#include <XCEditor/Fields/UIEditorEnumField.h>
+#include <XCEditor/Shell/UIEditorMenuPopup.h>
 #include "EditorValidationTheme.h"
 #include "Host/AutoScreenshot.h"
 #include "Host/NativeRenderer.h"
@@ -51,8 +51,6 @@ using XCEngine::UI::Editor::Widgets::UIEditorEnumFieldHitTarget;
 using XCEngine::UI::Editor::Widgets::UIEditorEnumFieldHitTargetKind;
 using XCEngine::UI::Editor::Widgets::UIEditorEnumFieldSpec;
 using XCEngine::UI::Editor::Widgets::UIEditorMenuPopupInvalidIndex;
-namespace Style = XCEngine::UI::Style;
-
 constexpr const wchar_t* kWindowClassName = L"XCUIEditorEnumFieldBasicValidation";
 constexpr const wchar_t* kWindowTitle = L"XCUI Editor | EnumField Basic";
 
@@ -84,11 +82,6 @@ std::filesystem::path ResolveRepoRootPath() {
     return std::filesystem::path(root).lexically_normal();
 }
 
-std::filesystem::path ResolveValidationThemePath() {
-    return (ResolveRepoRootPath() / "tests/UI/Editor/integration/shared/themes/editor_validation.xctheme")
-        .lexically_normal();
-}
-
 bool ContainsPoint(const UIRect& rect, float x, float y) {
     return x >= rect.x &&
         x <= rect.x + rect.width &&
@@ -142,7 +135,7 @@ ScenarioLayout BuildScenarioLayout(
         layout.previewRect.x + 24.0f,
         layout.previewRect.y + 82.0f,
         340.0f,
-        32.0f);
+        22.0f);
 
     const float buttonWidth = (layout.controlRect.width - 44.0f) * 0.5f;
     const float buttonY = layout.controlRect.y + 32.0f;
@@ -387,14 +380,6 @@ private:
         m_captureRoot =
             ResolveRepoRootPath() / "tests/UI/Editor/integration/shell/enum_field_basic/captures";
         m_autoScreenshot.Initialize(m_captureRoot);
-        const auto themeLoad =
-            XCEngine::Tests::EditorUI::LoadEditorValidationTheme(ResolveValidationThemePath());
-        if (themeLoad.succeeded) {
-            m_theme = themeLoad.theme;
-            m_themeStatus = "loaded";
-        } else {
-            m_themeStatus = themeLoad.error.empty() ? "fallback" : themeLoad.error;
-        }
 
         ResetScenario();
         return true;
@@ -423,7 +408,7 @@ private:
         return BuildScenarioLayout(
             width,
             height,
-            XCEngine::Tests::EditorUI::ResolveEditorValidationShellMetrics(m_theme));
+            XCEngine::Tests::EditorUI::GetEditorValidationShellMetrics());
     }
 
     UIRect GetViewportRect() const {
@@ -458,8 +443,8 @@ private:
         }
 
         const ScenarioLayout layout = GetLayout();
-        const auto fieldMetrics = XCEngine::UI::Editor::ResolveUIEditorEnumFieldMetrics(m_theme);
-        const auto popupMetrics = XCEngine::UI::Editor::ResolveUIEditorMenuPopupMetrics(m_theme);
+        const auto fieldMetrics = XCEngine::UI::Editor::ResolveUIEditorEnumFieldMetrics();
+        const auto popupMetrics = XCEngine::UI::Editor::ResolveUIEditorMenuPopupMetrics();
         m_spec.selectedIndex = m_selectedIndex;
         m_frame = UpdateUIEditorEnumFieldInteraction(
             m_interactionState,
@@ -563,8 +548,8 @@ private:
 
     UIEditorEnumFieldInteractionResult PumpEvents(std::vector<UIInputEvent> events) {
         const ScenarioLayout layout = GetLayout();
-        const auto fieldMetrics = XCEngine::UI::Editor::ResolveUIEditorEnumFieldMetrics(m_theme);
-        const auto popupMetrics = XCEngine::UI::Editor::ResolveUIEditorMenuPopupMetrics(m_theme);
+        const auto fieldMetrics = XCEngine::UI::Editor::ResolveUIEditorEnumFieldMetrics();
+        const auto popupMetrics = XCEngine::UI::Editor::ResolveUIEditorMenuPopupMetrics();
         m_spec.selectedIndex = m_selectedIndex;
         m_frame = UpdateUIEditorEnumFieldInteraction(
             m_interactionState,
@@ -581,7 +566,7 @@ private:
 
     void UpdateResultText(const UIEditorEnumFieldInteractionResult& result) {
         if (result.selectionChanged && m_selectedIndex < m_spec.options.size()) {
-            m_lastResult = std::string("已切换到: ") + m_spec.options[m_selectedIndex];
+            m_lastResult = std::string("已切换选项: ") + m_spec.options[m_selectedIndex];
             return;
         }
         if (result.popupOpened) {
@@ -627,17 +612,17 @@ private:
         }
 
         const UIRect viewportRect = GetViewportRect();
-        const auto shellMetrics = XCEngine::Tests::EditorUI::ResolveEditorValidationShellMetrics(m_theme);
-        const auto shellPalette = XCEngine::Tests::EditorUI::ResolveEditorValidationShellPalette(m_theme);
+        const auto shellMetrics = XCEngine::Tests::EditorUI::GetEditorValidationShellMetrics();
+        const auto shellPalette = XCEngine::Tests::EditorUI::GetEditorValidationShellPalette();
         const ScenarioLayout layout = BuildScenarioLayout(viewportRect.width, viewportRect.height, shellMetrics);
         RefreshFrame();
 
         const UIEditorEnumFieldHitTarget currentHit =
             HitTestUIEditorEnumField(m_frame.layout, m_mousePosition);
-        const auto enumMetrics = XCEngine::UI::Editor::ResolveUIEditorEnumFieldMetrics(m_theme);
-        const auto enumPalette = XCEngine::UI::Editor::ResolveUIEditorEnumFieldPalette(m_theme);
-        const auto popupMetrics = XCEngine::UI::Editor::ResolveUIEditorMenuPopupMetrics(m_theme);
-        const auto popupPalette = XCEngine::UI::Editor::ResolveUIEditorMenuPopupPalette(m_theme);
+        const auto enumMetrics = XCEngine::UI::Editor::ResolveUIEditorEnumFieldMetrics();
+        const auto enumPalette = XCEngine::UI::Editor::ResolveUIEditorEnumFieldPalette();
+        const auto popupMetrics = XCEngine::UI::Editor::ResolveUIEditorMenuPopupMetrics();
+        const auto popupPalette = XCEngine::UI::Editor::ResolveUIEditorMenuPopupPalette();
 
         UIDrawData drawData = {};
         UIDrawList& drawList = drawData.EmplaceDrawList("EditorEnumFieldBasic");
@@ -648,26 +633,26 @@ private:
             layout.introRect,
             shellPalette,
             shellMetrics,
-            "这个测试在验证什么功能",
-            "只验证 Editor EnumField 的基础交互契约，不涉及 PropertyGrid 或业务 Inspector。");
+            "这个测试在验证什么功能？",
+            "验证枚举字段的下拉打开/关闭、键盘切换、高亮同步，以及固定 Inspector 风格承载。");
         drawList.AddText(
             UIPoint(layout.introRect.x + 16.0f, layout.introRect.y + 72.0f),
-            "1. 点击 value box 或 dropdown arrow，检查下拉菜单是否展开/收起。",
+            "1. 点击 value box 或 dropdown arrow，应该打开或关闭下拉菜单。",
             shellPalette.textPrimary,
             shellMetrics.bodyFontSize);
         drawList.AddText(
             UIPoint(layout.introRect.x + 16.0f, layout.introRect.y + 94.0f),
-            "2. 展开后 hover 列表项，检查高亮是否稳定跟随。",
+            "2. 打开后检查 hover 和高亮项是否同步更新。",
             shellPalette.textPrimary,
             shellMetrics.bodyFontSize);
         drawList.AddText(
             UIPoint(layout.introRect.x + 16.0f, layout.introRect.y + 116.0f),
-            "3. 获得 focus 后按 Up / Down / Home / End，再按 Enter / Space 选中，Esc 关闭。",
+            "3. 获得 focus 后，Up / Down / Home / End 切换高亮；Enter / Space 确认；Esc 关闭。",
             shellPalette.textPrimary,
             shellMetrics.bodyFontSize);
         drawList.AddText(
             UIPoint(layout.introRect.x + 16.0f, layout.introRect.y + 138.0f),
-            "4. 检查 Hover / Popup / Highlight / Selected / Result 是否同步更新。",
+            "4. 观察 Hover / Popup / Highlight / Selected / Result 是否同步。",
             shellPalette.textPrimary,
             shellMetrics.bodyFontSize);
         drawList.AddText(
@@ -735,11 +720,6 @@ private:
             captureSummary,
             shellPalette.textWeak,
             shellMetrics.bodyFontSize);
-        drawList.AddText(
-            UIPoint(layout.stateRect.x + 16.0f, layout.stateRect.y + 238.0f),
-            "Theme: " + m_themeStatus,
-            shellPalette.textWeak,
-            shellMetrics.bodyFontSize);
 
         DrawCard(
             drawList,
@@ -747,7 +727,7 @@ private:
             shellPalette,
             shellMetrics,
             "EnumField 预览",
-            "这里只放一个 Unity 风格 EnumField。");
+            "这里只放一个固定样式的枚举字段预览。");
         AppendUIEditorEnumField(
             drawList,
             layout.fieldRect,
@@ -783,12 +763,10 @@ private:
     std::size_t m_selectedIndex = 0u;
     UIEditorEnumFieldInteractionState m_interactionState = {};
     UIEditorEnumFieldInteractionFrame m_frame = {};
-    Style::UITheme m_theme = {};
     UIPoint m_mousePosition = UIPoint(-1000.0f, -1000.0f);
     ActionId m_hoveredAction = ActionId::Reset;
     bool m_hasHoveredAction = false;
     std::string m_lastResult = {};
-    std::string m_themeStatus = "fallback";
 };
 
 } // namespace