Refine editor host boundary

docs/plan/editor-core-refactor-plan.md

@@ -38,9 +38,10 @@ incomplete:
 
 - `XCEditorCore` now limits its public app include surface to
   `editor/app/Core`, `editor/app/Commands`, `editor/app/State`, and
-  `editor/app/Host`, and app/core sources now include through explicit module
-  roots instead of a private `editor/app` compatibility root. The app has not
-  yet converged on the final directory names.
+  `editor/app/Host/Interfaces`, and app/core sources now include through
+  explicit module roots instead of a private `editor/app` compatibility root.
+  Concrete host code has converged under `editor/app/Host/Win32` and
+  `editor/app/Host/D3D12`.
 - Feature panels no longer use `Composition/EditorContext.h` directly, and
   the first app-core test target now exercises `XCEditorCore` outside the
   executable host.
@@ -72,6 +73,8 @@ Completed boundary cuts:
   `editor/app/Host/Interfaces`, including editor window host interfaces,
   render-runtime contracts, texture/viewport host contracts, pointer-capture
   contracts, and system interaction service interfaces.
+- Concrete Win32 and D3D12 host implementations now live under
+  `editor/app/Host/Win32` and `editor/app/Host/D3D12`.
 - Shared window screen geometry, chrome metrics, and frame transfer requests
   now live under `editor/app/Core/Windowing`, and
   `XCEditorCore` no longer exports the whole `editor/app` root as a public
@@ -80,7 +83,8 @@ Completed boundary cuts:
   `XCEditorCore` and `XCEditor`. App implementation files now include through
   explicit module roots such as `app/Composition`, `app/Features`,
   `app/Windowing`, `app/Rendering`, `app/Scene`, `app/Services`,
-  `app/Support`, `app/Bootstrap`, and `app/Platform/Win32`.
+  `app/Support`, `app/Bootstrap`, `app/Host/Interfaces`, `app/Host/Win32`,
+  and `app/Host/D3D12`.
 - `editor_app_core_tests` now links `XCEditorCore` directly and uses explicit
   app module include roots. Its initial suite covers host command routing,
   project runtime, shell asset validation, project browser model, hierarchy
@@ -92,9 +96,8 @@ directories, and CMake exposed the whole `editor/app` include root through
 `XCEditorCore` usage requirements. The public include surface has now been
 narrowed, and internal source compatibility with the private app root has now
 been removed. The first app-core test target now exercises the narrowed
-surface. Remaining work is to continue converging host code on the target
-directory shape and to restore additional stale app feature/viewport tests
-without widening the include surface.
+surface. Remaining work is to restore additional stale app feature/viewport
+tests without widening the include surface.
 
 ## Target Directory Shape
 
@@ -276,8 +279,8 @@ Keep in `XCEditor` executable:
 - `app/main.cpp`
 - `app/Bootstrap/Application.*`
 - `app/Bootstrap/EditorApp.rc`
-- `app/Platform/Win32/**`
-- `app/Rendering/D3D12/**`
+- `app/Host/Win32/**`
+- `app/Host/D3D12/**`
 - any concrete host glue that includes `windows.h`
 
 `XCEditor` links `XCEditorCore`, `XCUIEditor`, and concrete platform/rendering
@@ -317,6 +320,7 @@ Remaining stale test references to fix or remove in later cuts:
 
 - `Ports/SystemInteractionPort.h`
 - `Rendering/Viewport/ViewportRenderTargetInternal.h`
+- `app/Platform/Win32/WindowManager/TabDragDropTarget.h`
 
 The test target is part of the architecture. If app core cannot be tested
 without starting the executable host, the boundary is not real.
@@ -418,11 +422,12 @@ Completed cuts:
 - `EditorWindowTransferRequests`, window screen geometry, and title-bar chrome
   metrics now live under `app/Core/Windowing/`.
 - `XCEditorCore` now exposes only `app/Core`, `app/Commands`, `app/State`, and
-  `app/Host` through its public usage requirements, and both `XCEditorCore`
-  and `XCEditor` enumerate explicit private module roots instead of using
-  `editor/app` as a compatibility include directory.
-- Remaining work in this phase is to continue converging concrete host code on
-  the `app/Host/Win32` and `app/Host/D3D12` directory shape.
+  `app/Host/Interfaces` through its public usage requirements, and both
+  `XCEditorCore` and `XCEditor` enumerate explicit module roots instead of
+  using `editor/app` as a compatibility include directory.
+- Concrete Win32 and D3D12 host implementations now live under
+  `app/Host/Win32` and `app/Host/D3D12`; `XCEditor` consumes those roots
+  privately, while `XCEditorCore` only sees `app/Host/Interfaces`.
 
 ## Phase 6: Documentation Update
 

editor/AGENTS.md

@@ -24,7 +24,8 @@ change.
   gate that proves the product-core boundary outside the executable host.
 - `XCEditorCore` does not publish the whole `editor/app` root as a usage
   include directory. Its public app include surface is limited to shared
-  contracts under `app/Core`, `app/Commands`, `app/State`, and `app/Host`.
+  contracts under `app/Core`, `app/Commands`, `app/State`, and
+  `app/Host/Interfaces`.
 - `XCEditorCore` also does not consume the whole `editor/app` root privately.
   Its implementation include paths enumerate concrete app module roots such as
   `app/Composition`, `app/Features`, `app/Windowing`, `app/Rendering`,
@@ -59,14 +60,16 @@ change.
   editor core and executable host code: editor window host interfaces,
   render-runtime factories, UI texture hosts, viewport render hosts, and system
   interaction services.
+- `app/Host/Win32/` owns `HWND`, message dispatch, native pointer capture,
+  borderless chrome, DPI, placement, and Win32 system integration.
+- `app/Host/D3D12/` owns the concrete D3D12 editor window render runtime, UI
+  renderer, texture host, text system, swap-chain presenter, and capture path.
 - `app/Composition/` builds the editor shell asset, coordinates shell update
   phases, and connects app state to hosted panel runtimes.
 - `app/Windowing/` owns window instances, content controllers, lifecycle,
   workspace synchronization, and utility-window creation.
-- `app/Platform/Win32/` owns `HWND`, message dispatch, native pointer capture,
-  borderless chrome, DPI, placement, and Win32 system integration.
 - `app/Rendering/` owns built-in icons, viewport render targets, object
-  picking, scene viewport passes, and concrete D3D12 UI/rendering hosts.
+  picking, scene viewport passes, and viewport render services.
 - `app/Features/` contains user-facing panels and editor tools: Hierarchy,
   Scene viewport, Inspector, Project, Console, Color Picker, and component UI.
 - `app/Features/EditorWorkspacePanelRegistry.*` is the concrete workspace
@@ -88,12 +91,12 @@ change.
 
 - Keep `XCUIEditor` below the app. Public headers under `include/XCEditor`
   must not include `app/**`, Win32, D3D12, or feature-panel headers.
-- Keep platform specifics in `app/Platform/Win32`; keep GPU-window specifics in
-  `app/Rendering/D3D12`.
+- Keep platform specifics in `app/Host/Win32`; keep GPU-window specifics in
+  `app/Host/D3D12`.
 - Keep neutral host/render/system contracts in `app/Host/Interfaces` or
   shared value contracts in `app/Core`. Do not add new public app contracts
-  under concrete `app/Windowing`, `app/Rendering`, `app/Platform`, or
-  `app/System` paths.
+  under concrete `app/Windowing`, `app/Rendering`, `app/Host/Win32`,
+  `app/Host/D3D12`, or legacy `app/Platform` paths.
 - Keep shell composition and widget logic data-driven. The reusable layer should
   emit frames, layouts, draw data, command results, and transfer requests; the
   app decides how those requests affect native windows and engine services.
@@ -149,7 +152,7 @@ change.
   scale, and frame-rate display.
 - `EditorWindowInstance` is the managed host-window object. It owns lifecycle
   state and bridges its native peer to the runtime controller.
-- `EditorWindow` in `app/Platform/Win32/Windowing` owns the native peer
+- `EditorWindow` in `app/Host/Win32/Windowing` owns the native peer
   behavior: `HWND`, queued input, pointer capture, chrome interaction, resize
   snapshots, cursor feedback, invalidation, and native destruction.
 
@@ -307,8 +310,9 @@ inside pure shell/widget code.
   boundary build-visible before finer-grained directories are cleaned up.
 - `XCEditorCore` does not use `editor/app` as a private implementation include
   root. Its public usage requirements expose only `app/Core`, `app/Commands`,
-  `app/State`, `app/Host`, `include`, and engine headers; implementation files
-  use explicit module roots instead of the app-wide compatibility root.
+  `app/State`, `app/Host/Interfaces`, `include`, and engine headers;
+  implementation files use explicit module roots instead of the app-wide
+  compatibility root.
 - App-facing unit tests follow the same rule. `editor_app_core_tests` uses
   explicit module include roots and must not regain the whole `editor/app`
   root to make stale tests compile.
@@ -370,7 +374,7 @@ inside pure shell/widget code.
 - `editor/src/Workspace/UIEditorWorkspaceController.cpp`
 - `editor/include/XCEditor/Workspace/UIEditorWindowWorkspaceController.h`
 - `editor/src/Workspace/UIEditorWindowWorkspaceController.cpp`
-- `editor/app/Platform/Win32/Windowing/EditorWindowMessageDispatcher.cpp`
+- `editor/app/Host/Win32/Windowing/EditorWindowMessageDispatcher.cpp`
 - `editor/app/Host/Interfaces/EditorWindowRenderRuntime.h`
 - `editor/app/Host/Interfaces/EditorWindowHostInterfaces.h`
 - `editor/app/Core/Windowing/EditorWindowTransferRequests.h`
@@ -428,12 +432,15 @@ ownership rule.
 - The old `Win32EditorWindowRenderRuntimeSurface` adapter was removed. Win32
   now captures native render startup data into the neutral
   `Rendering::Host::EditorWindowRenderRuntimeSurface` value contract, so D3D12
-  no longer includes concrete `app/Platform/Win32/**` editor surface headers.
+  no longer includes concrete Win32 editor surface headers.
 - Neutral host-facing contracts moved under `app/Host/Interfaces`, including
   editor window host interfaces, render runtime contracts, UI texture/viewport
   host contracts, pointer-capture contracts, and system interaction service.
   `XCEditorCore` no longer publishes the entire `editor/app` root through its
   public CMake include surface.
+- Concrete host code now lives under `app/Host/Win32` and `app/Host/D3D12`.
+  `XCEditorCore` publicly exposes only `app/Host/Interfaces`, while `XCEditor`
+  consumes the concrete host module roots privately.
 - The private `editor/app` CMake include root was removed from `XCEditorCore`
   and `XCEditor`. App sources and editor app-facing unit files now include
   through explicit module roots, so app-wide include-root drift is caught by

editor/CMakeLists.txt

@@ -192,21 +192,21 @@ set(XCUI_EDITOR_APP_WINDOWING_SOURCES
 )
 
 set(XCUI_EDITOR_HOST_PLATFORM_SOURCES
-    app/Platform/Win32/Chrome/BorderlessWindowChrome.cpp
-    app/Platform/Win32/Chrome/BorderlessWindowFrame.cpp
+    app/Host/Win32/Chrome/BorderlessWindowChrome.cpp
+    app/Host/Win32/Chrome/BorderlessWindowFrame.cpp
 )
 
 set(XCUI_EDITOR_HOST_RENDERING_SOURCES
-    app/Rendering/D3D12/D3D12EditorWindowRenderRuntime.cpp
-    app/Rendering/D3D12/D3D12HostDevice.cpp
-    app/Rendering/D3D12/D3D12WindowCapture.cpp
-    app/Rendering/D3D12/D3D12UiRenderer.cpp
-    app/Rendering/D3D12/D3D12UiTextSystem.cpp
-    app/Rendering/D3D12/D3D12UiTextureHost.cpp
-    app/Rendering/D3D12/D3D12ShaderResourceDescriptorAllocator.cpp
-    app/Rendering/D3D12/D3D12WindowRenderer.cpp
-    app/Rendering/D3D12/D3D12WindowSwapChainPresenter.cpp
-    app/Rendering/D3D12/D3D12WindowRenderLoop.cpp
+    app/Host/D3D12/D3D12EditorWindowRenderRuntime.cpp
+    app/Host/D3D12/D3D12HostDevice.cpp
+    app/Host/D3D12/D3D12WindowCapture.cpp
+    app/Host/D3D12/D3D12UiRenderer.cpp
+    app/Host/D3D12/D3D12UiTextSystem.cpp
+    app/Host/D3D12/D3D12UiTextureHost.cpp
+    app/Host/D3D12/D3D12ShaderResourceDescriptorAllocator.cpp
+    app/Host/D3D12/D3D12WindowRenderer.cpp
+    app/Host/D3D12/D3D12WindowSwapChainPresenter.cpp
+    app/Host/D3D12/D3D12WindowRenderLoop.cpp
 )
 
 if(XCENGINE_BUILD_XCUI_EDITOR_APP)
@@ -286,15 +286,15 @@ if(XCENGINE_BUILD_XCUI_EDITOR_APP)
     )
 
     set(XCUI_EDITOR_APP_PLATFORM_SOURCES
-        app/Platform/Win32/Diagnostics/Win32CrashTrace.cpp
-        app/Platform/Win32/Windowing/EditorWindow.cpp
-        app/Platform/Win32/Windowing/EditorFloatingWindowPlacement.cpp
-        app/Platform/Win32/Windowing/EditorWindowSession.cpp
-        app/Platform/Win32/Chrome/EditorWindowChromeController.cpp
-        app/Platform/Win32/Runtime/EditorWindowInputController.cpp
-        app/Platform/Win32/System/Win32SystemInteractionHost.cpp
-        app/Platform/Win32/Windowing/EditorWindowHostRuntime.cpp
-        app/Platform/Win32/Windowing/EditorWindowMessageDispatcher.cpp
+        app/Host/Win32/Diagnostics/Win32CrashTrace.cpp
+        app/Host/Win32/Windowing/EditorWindow.cpp
+        app/Host/Win32/Windowing/EditorFloatingWindowPlacement.cpp
+        app/Host/Win32/Windowing/EditorWindowSession.cpp
+        app/Host/Win32/Chrome/EditorWindowChromeController.cpp
+        app/Host/Win32/Runtime/EditorWindowInputController.cpp
+        app/Host/Win32/System/Win32SystemInteractionHost.cpp
+        app/Host/Win32/Windowing/EditorWindowHostRuntime.cpp
+        app/Host/Win32/Windowing/EditorWindowMessageDispatcher.cpp
     )
 
     set(XCUI_EDITOR_APP_CORE_SOURCES
@@ -321,7 +321,7 @@ if(XCENGINE_BUILD_XCUI_EDITOR_APP)
         ${CMAKE_CURRENT_SOURCE_DIR}/app/Core
         ${CMAKE_CURRENT_SOURCE_DIR}/app/Commands
         ${CMAKE_CURRENT_SOURCE_DIR}/app/State
-        ${CMAKE_CURRENT_SOURCE_DIR}/app/Host
+        ${CMAKE_CURRENT_SOURCE_DIR}/app/Host/Interfaces
         ${CMAKE_CURRENT_SOURCE_DIR}/include
         ${CMAKE_SOURCE_DIR}/engine/include
         ${CMAKE_SOURCE_DIR}/engine/third_party/stb
@@ -365,8 +365,9 @@ if(XCENGINE_BUILD_XCUI_EDITOR_APP)
         ${CMAKE_CURRENT_SOURCE_DIR}/app/Composition
         ${CMAKE_CURRENT_SOURCE_DIR}/app/Core
         ${CMAKE_CURRENT_SOURCE_DIR}/app/Features
-        ${CMAKE_CURRENT_SOURCE_DIR}/app/Host
-        ${CMAKE_CURRENT_SOURCE_DIR}/app/Platform/Win32
+        ${CMAKE_CURRENT_SOURCE_DIR}/app/Host/Interfaces
+        ${CMAKE_CURRENT_SOURCE_DIR}/app/Host/Win32
+        ${CMAKE_CURRENT_SOURCE_DIR}/app/Host/D3D12
         ${CMAKE_CURRENT_SOURCE_DIR}/app/Rendering
         ${CMAKE_CURRENT_SOURCE_DIR}/app/Scene
         ${CMAKE_CURRENT_SOURCE_DIR}/app/Services

editor/app/Bootstrap/Application.cpp

@@ -1,6 +1,6 @@
 #include "Application.h"
 #include "EditorResources.h"
-#include "Interfaces/SystemInteractionService.h"
+#include "SystemInteractionService.h"
 #include "EditorContext.h"
 #include "EditorUtilityWindowRegistry.h"
 #include "EditorWorkspacePanelRegistry.h"
@@ -11,7 +11,7 @@
 #include "Windowing/EditorWindowHostConfig.h"
 #include "Windowing/EditorWindowHostRuntime.h"
 #include "Windowing/EditorWindowMessageDispatcher.h"
-#include "D3D12/D3D12EditorWindowRenderRuntime.h"
+#include "D3D12EditorWindowRenderRuntime.h"
 #include "EnvironmentFlags.h"
 #include "ExecutablePath.h"
 

editor/app/Composition/EditorShellRuntime.cpp

@@ -1,6 +1,6 @@
 #include "EditorShellRuntime.h"
-#include "Interfaces/UiTextureHost.h"
-#include "Interfaces/ViewportRenderHost.h"
+#include "UiTextureHost.h"
+#include "ViewportRenderHost.h"
 #include "EditorContext.h"
 #include <XCEditor/Shell/UIEditorShellCapturePolicy.h>
 #include <XCEngine/Rendering/RenderContext.h>

editor/app/Features/Project/ProjectPanel.cpp

@@ -6,7 +6,7 @@
 #include <algorithm>
 #include <cmath>
 #include <string_view>
-#include "Interfaces/SystemInteractionService.h"
+#include "SystemInteractionService.h"
 #include "Project/EditorProjectRuntime.h"
 #include "EditorCommandFocusService.h"
 #include <XCEditor/Fields/UIEditorFieldStyle.h>

editor/app/Features/Scene/SceneViewportFeature.cpp

@@ -1,7 +1,7 @@
 #include "Scene/SceneViewportFeature.h"
 
 #include "Panels/EditorPanelIds.h"
-#include "Interfaces/UiTextureHost.h"
+#include "UiTextureHost.h"
 #include "Viewport/ViewportHostService.h"
 #include "EditorSceneRuntime.h"
 #include "EditorCommandFocusService.h"

editor/app/Features/Scene/SceneViewportToolOverlay.cpp

@@ -1,6 +1,6 @@
 #include "Scene/SceneViewportToolOverlay.h"
 
-#include "Interfaces/UiTextureHost.h"
+#include "UiTextureHost.h"
 
 #include <XCEditor/Widgets/UIEditorTextLayout.h>
 

editor/app/Features/Scene/SceneViewportToolOverlay.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "SceneToolState.h"
-#include "Interfaces/HostFwd.h"
+#include "HostFwd.h"
 
 #include <XCEngine/UI/DrawData.h>
 #include <XCEngine/UI/Types.h>

editor/app/Host/D3D12/D3D12EditorWindowRenderRuntime.cpp

@@ -1,4 +1,4 @@
-#include "D3D12/D3D12EditorWindowRenderRuntime.h"
+#include "D3D12EditorWindowRenderRuntime.h"
 
 #include <algorithm>
 #include <memory>

editor/app/Host/D3D12/D3D12EditorWindowRenderRuntime.h

@@ -4,12 +4,12 @@
 #define NOMINMAX
 #endif
 
-#include "D3D12/D3D12UiRenderer.h"
-#include "D3D12/D3D12UiTextSystem.h"
-#include "D3D12/D3D12UiTextureHost.h"
-#include "D3D12/D3D12WindowRenderLoop.h"
-#include "D3D12/D3D12WindowRenderer.h"
-#include "Interfaces/EditorWindowRenderRuntime.h"
+#include "D3D12UiRenderer.h"
+#include "D3D12UiTextSystem.h"
+#include "D3D12UiTextureHost.h"
+#include "D3D12WindowRenderLoop.h"
+#include "D3D12WindowRenderer.h"
+#include "EditorWindowRenderRuntime.h"
 
 #include <memory>
 

editor/app/Host/D3D12/D3D12UiTextureHost.h

@@ -4,7 +4,7 @@
 #define NOMINMAX
 #endif
 
-#include "Interfaces/UiTextureHost.h"
+#include "UiTextureHost.h"
 
 #include "D3D12WindowRenderer.h"
 

editor/app/Host/D3D12/D3D12WindowRenderer.h

@@ -4,7 +4,7 @@
 #define NOMINMAX
 #endif
 
-#include "Interfaces/ViewportRenderHost.h"
+#include "ViewportRenderHost.h"
 #include "D3D12HostDevice.h"
 #include "D3D12ShaderResourceDescriptorAllocator.h"
 #include "D3D12WindowCapture.h"

editor/app/Host/Win32/Chrome/EditorWindowChromeController.cpp

@@ -3,8 +3,8 @@
 #include "Windowing/EditorWindow.h"
 #include "Windowing/EditorWindowSupport.h"
 #include "Windowing/EditorWindowMetrics.h"
-#include "Interfaces/EditorWindowContentBindings.h"
-#include "Interfaces/EditorWindowHostCoordinator.h"
+#include "EditorWindowContentBindings.h"
+#include "EditorWindowHostCoordinator.h"
 #include "EditorWindowVisuals.h"
 
 #include <XCEditor/Foundation/UIEditorTheme.h>

editor/app/Host/Win32/System/Win32SystemInteractionHost.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Interfaces/SystemInteractionService.h"
+#include "SystemInteractionService.h"
 
 namespace XCEngine::UI::Editor::Host {
 

editor/app/Host/Win32/Windowing/EditorWindow.cpp

@@ -5,7 +5,7 @@
 #include "Windowing/EditorWindowSupport.h"
 #include "Runtime/EditorWindowInputController.h"
 #include "Windowing/EditorWindowMetrics.h"
-#include "Interfaces/EditorWindowContentBindings.h"
+#include "EditorWindowContentBindings.h"
 #include "EditorWindowDiagnostics.h"
 #include <XCEditor/Docking/UIEditorDockHostTransfer.h>
 #include <XCEditor/Foundation/UIEditorRuntimeTrace.h>

editor/app/Host/Win32/Windowing/EditorWindow.h

@@ -5,7 +5,7 @@
 #endif
 
 #include "Windowing/EditorWindowSession.h"
-#include "Interfaces/EditorWindowHostInterfaces.h"
+#include "EditorWindowHostInterfaces.h"
 
 #include <windows.h>
 

editor/app/Host/Win32/Windowing/EditorWindowHostRuntime.cpp

@@ -4,7 +4,7 @@
 #include "Chrome/EditorWindowChromeController.h"
 #include "Windowing/EditorFloatingWindowPlacement.h"
 #include "Windowing/EditorWindow.h"
-#include "Interfaces/EditorWindowHostCoordinator.h"
+#include "EditorWindowHostCoordinator.h"
 
 #include <XCEditor/Foundation/UIEditorRuntimeTrace.h>
 

editor/app/Host/Win32/Windowing/EditorWindowHostRuntime.h

@@ -2,8 +2,8 @@
 
 #include "Windowing/EditorWindow.h"
 #include "Windowing/EditorWindowHostConfig.h"
-#include "Interfaces/EditorWindowHostCoordinator.h"
-#include "Interfaces/EditorWindowHostInterfaces.h"
+#include "EditorWindowHostCoordinator.h"
+#include "EditorWindowHostInterfaces.h"
 
 #include <filesystem>
 #include <memory>

editor/app/Host/Win32/Windowing/EditorWindowMessageDispatcher.cpp

@@ -5,8 +5,8 @@
 #include "Runtime/EditorWindowInputController.h"
 #include "Windowing/EditorWindow.h"
 #include "Windowing/EditorWindowPointerCapture.h"
-#include "Interfaces/EditorWindowContentBindings.h"
-#include "Interfaces/EditorWindowHostCoordinator.h"
+#include "EditorWindowContentBindings.h"
+#include "EditorWindowHostCoordinator.h"
 
 #include <cstdint>
 #include <sstream>

editor/app/Host/Win32/Windowing/EditorWindowPointerCapture.h

@@ -0,0 +1,3 @@
+#pragma once
+
+#include <EditorWindowPointerCapture.h>

editor/app/Platform/Win32/Windowing/EditorWindowPointerCapture.h

@@ -1,3 +0,0 @@
-#pragma once
-
-#include "Interfaces/EditorWindowPointerCapture.h"

editor/app/Rendering/Assets/BuiltInIcons.cpp

@@ -1,7 +1,7 @@
 #include "BuiltInIcons.h"
 
 #include "EditorResources.h"
-#include "Interfaces/UiTextureHost.h"
+#include "UiTextureHost.h"
 #include "EmbeddedPngLoader.h"
 #include "StringEncoding.h"
 

editor/app/Rendering/Assets/BuiltInIcons.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Interfaces/HostFwd.h"
+#include "HostFwd.h"
 
 #include <XCEngine/UI/Types.h>
 

editor/app/Rendering/Viewport/ViewportHostService.cpp

@@ -1,6 +1,6 @@
 #include "ViewportHostService.h"
 
-#include "Interfaces/ViewportRenderHost.h"
+#include "ViewportRenderHost.h"
 
 #include <XCEngine/RHI/RHICommandList.h>
 

editor/app/Rendering/Viewport/ViewportHostService.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Interfaces/HostFwd.h"
+#include "HostFwd.h"
 #include "Viewport/ViewportContentRenderer.h"
 #include "ViewportRenderTargets.h"
 

editor/app/Rendering/Viewport/ViewportRenderTargets.cpp

@@ -1,6 +1,6 @@
 #include "Viewport/ViewportRenderTargets.h"
 
-#include "Interfaces/ViewportRenderHost.h"
+#include "ViewportRenderHost.h"
 
 namespace XCEngine::UI::Editor::App {
 

editor/app/Rendering/Viewport/ViewportRenderTargets.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Interfaces/HostFwd.h"
+#include "HostFwd.h"
 #include "ViewportRenderTargetUtils.h"
 
 #include <XCEngine/RHI/RHIDevice.h>

editor/app/Support/EmbeddedPngLoader.cpp

@@ -1,6 +1,6 @@
 #include "EmbeddedPngLoader.h"
 
-#include "Interfaces/UiTextureHost.h"
+#include "UiTextureHost.h"
 
 namespace XCEngine::UI::Editor::App {
 

editor/app/Support/EmbeddedPngLoader.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Interfaces/HostFwd.h"
+#include "HostFwd.h"
 
 #include <XCEngine/UI/Types.h>
 

editor/app/Windowing/Content/EditorWindowContentController.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "Windowing/EditorWindowTransferRequests.h"
-#include "Interfaces/EditorWindowContentBindings.h"
+#include "EditorWindowContentBindings.h"
 
 #include <XCEditor/Foundation/UIEditorTextMeasurement.h>
 

editor/app/Windowing/Coordinator/EditorUtilityWindowCoordinator.cpp

@@ -7,7 +7,7 @@
 #include "EditorWindowManager.h"
 #include "Runtime/EditorWindowRuntimeController.h"
 
-#include <Interfaces/EditorWindowRenderRuntime.h>
+#include "EditorWindowRenderRuntime.h"
 
 #include <cmath>
 #include <memory>

editor/app/Windowing/Coordinator/EditorUtilityWindowCoordinator.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "Windowing/EditorWindowTransferRequests.h"
-#include "Interfaces/EditorWindowHostInterfaces.h"
+#include "EditorWindowHostInterfaces.h"
 
 #include <string_view>
 

editor/app/Windowing/Coordinator/EditorWindowLifecycleCoordinator.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Interfaces/EditorWindowHostInterfaces.h"
+#include "EditorWindowHostInterfaces.h"
 
 #include <string_view>
 

editor/app/Windowing/Coordinator/EditorWindowWorkspaceCoordinator.cpp

@@ -6,7 +6,7 @@
 #include "EditorWindowManager.h"
 #include "Runtime/EditorWindowRuntimeController.h"
 
-#include <Interfaces/EditorWindowRenderRuntime.h>
+#include "EditorWindowRenderRuntime.h"
 
 #include <XCEditor/Docking/UIEditorDockHostTransfer.h>
 #include <XCEditor/Windowing/Presentation/EditorWindowPresentationPolicy.h>

editor/app/Windowing/Coordinator/EditorWindowWorkspaceCoordinator.h

@@ -5,7 +5,7 @@
 #endif
 
 #include "Windowing/EditorWindowTransferRequests.h"
-#include "Interfaces/EditorWindowHostInterfaces.h"
+#include "EditorWindowHostInterfaces.h"
 
 #include <XCEditor/Windowing/Presentation/EditorWorkspaceWindowProjection.h>
 #include <XCEditor/Windowing/System/EditorWindowSynchronizationPlan.h>

editor/app/Windowing/EditorWindowInstance.cpp

@@ -1,7 +1,7 @@
 #include "EditorWindowInstance.h"
 
 #include "StringEncoding.h"
-#include "Interfaces/EditorWindowContentBindings.h"
+#include "EditorWindowContentBindings.h"
 #include "Runtime/EditorWindowRuntimeController.h"
 #include "EditorWindowVisuals.h"
 

editor/app/Windowing/EditorWindowInstance.h

@@ -4,7 +4,7 @@
 #define NOMINMAX
 #endif
 
-#include "Interfaces/EditorWindowHostInterfaces.h"
+#include "EditorWindowHostInterfaces.h"
 
 #include <memory>
 #include <string>

editor/app/Windowing/EditorWindowManager.cpp

@@ -8,7 +8,7 @@
 #include "EditorWindowInstance.h"
 #include "Runtime/EditorWindowRuntimeController.h"
 
-#include <Interfaces/EditorWindowRenderRuntime.h>
+#include "EditorWindowRenderRuntime.h"
 
 #include <XCEditor/Workspace/UIEditorWindowWorkspaceModel.h>
 

editor/app/Windowing/EditorWindowManager.h

@@ -5,9 +5,9 @@
 #endif
 
 #include "UtilityWindows/EditorUtilityWindowRuntime.h"
-#include "Interfaces/EditorWindowHostCoordinator.h"
-#include "Interfaces/EditorWindowHostInterfaces.h"
-#include "Interfaces/EditorWindowHostTypes.h"
+#include "EditorWindowHostCoordinator.h"
+#include "EditorWindowHostInterfaces.h"
+#include "EditorWindowHostTypes.h"
 #include "EditorWindowInstance.h"
 #include "WorkspacePanels/EditorWorkspacePanelRuntime.h"
 #include <memory>

editor/app/Windowing/Runtime/EditorWindowRuntimeController.h

@@ -7,7 +7,7 @@
 #include "Content/EditorWindowContentController.h"
 #include "Runtime/EditorWindowScreenshotController.h"
 
-#include <Interfaces/EditorWindowRenderRuntime.h>
+#include "EditorWindowRenderRuntime.h"
 
 #include <XCEngine/UI/DrawData.h>
 

tests/UI/Editor/manual_validation/CMakeLists.txt

@@ -2,7 +2,7 @@ file(TO_CMAKE_PATH "${CMAKE_SOURCE_DIR}" XCENGINE_EDITOR_UI_TESTS_REPO_ROOT_PATH
 
 if(NOT EXISTS "${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/app"
     OR NOT EXISTS "${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include"
-    OR NOT EXISTS "${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/app/Platform/Win32/Runtime/InputModifierTracker.h")
+    OR NOT EXISTS "${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/app/Host/Win32/Runtime/InputModifierTracker.h")
     message(FATAL_ERROR
         "Editor UI manual validation expects the current editor tree under "
         "${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}.")

tests/UI/Editor/unit/CMakeLists.txt

@@ -124,7 +124,7 @@ if(TARGET XCEditorCore)
             ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/app/Composition
             ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/app/Core
             ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/app/Features
-            ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/app/Host
+            ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/app/Host/Interfaces
             ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/app/Rendering
             ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/app/Scene
             ${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/app/Services

tests/UI/Editor/unit/test_editor_window_input_routing.cpp

@@ -2,7 +2,7 @@
 #include <XCEditor/Shell/UIEditorShellCapturePolicy.h>
 #include <XCEditor/Workspace/UIEditorWorkspaceCompose.h>
 
-#include "app/Platform/Win32/EditorWindowPointerCapture.h"
+#include "app/Host/Interfaces/EditorWindowPointerCapture.h"
 
 #include <gtest/gtest.h>
 

tests/UI/Editor/unit/test_input_modifier_tracker.cpp

@@ -4,7 +4,7 @@
 
 #include <gtest/gtest.h>
 
-#include "app/Platform/Win32/InputModifierTracker.h"
+#include "app/Host/Win32/InputModifierTracker.h"
 
 #include <XCEngine/UI/Types.h>