xuanchi/XCEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor editor ui host and shell asset layout

Browse Source
This commit is contained in:
ssdfasd
2026-04-10 01:59:15 +08:00
parent b5ba985831
commit 899442c64d
54 changed files with 150 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
new_editor/CMakeLists.txt
View File

@@ -65,7 +65,7 @@ set(XCUI_EDITOR_COLLECTION_SOURCES
)
set(XCUI_EDITOR_SHELL_SOURCES
src/Shell/EditorShellAsset.cpp
src/Shell/UIEditorShellAsset.cpp
src/Shell/UIEditorDockHost.cpp
src/Shell/UIEditorDockHostInteraction.cpp
src/Shell/UIEditorMenuBar.cpp
@@ -122,13 +122,13 @@ target_link_libraries(XCUIEditorLib PUBLIC
)
add_library(XCUIEditorHost STATIC
app/Host/AutoScreenshot.cpp
app/Host/NativeRenderer.cpp
Host/AutoScreenshot.cpp
Host/NativeRenderer.cpp
)
target_include_directories(XCUIEditorHost
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/app
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/engine/include
)
@@ -148,8 +148,8 @@ if(XCENGINE_BUILD_XCUI_EDITOR_APP)
)
target_include_directories(XCUIEditorApp PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/app
${CMAKE_CURRENT_SOURCE_DIR}/src
)
target_compile_definitions(XCUIEditorApp PRIVATE
@@ -165,6 +165,5 @@ if(XCENGINE_BUILD_XCUI_EDITOR_APP)
set_target_properties(XCUIEditorApp PROPERTIES
OUTPUT_NAME "XCUIEditor"
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/bin"
)
endif()

0
new_editor/app/Host/AutoScreenshot.cpp → new_editor/Host/AutoScreenshot.cpp
View File

0
new_editor/app/Host/AutoScreenshot.h → new_editor/Host/AutoScreenshot.h
View File

0
new_editor/app/Host/InputModifierTracker.h → new_editor/Host/InputModifierTracker.h
View File

0
new_editor/app/Host/NativeRenderer.cpp → new_editor/Host/NativeRenderer.cpp
View File

0
new_editor/app/Host/NativeRenderer.h → new_editor/Host/NativeRenderer.h
View File

50
new_editor/app/Application.h
View File

@@ -4,15 +4,11 @@
#define NOMINMAX
#endif
#include "Host/AutoScreenshot.h"
#include "Host/InputModifierTracker.h"
#include "Host/NativeRenderer.h"
#include <Host/AutoScreenshot.h>
#include <Host/InputModifierTracker.h>
#include <Host/NativeRenderer.h>
#include "Shell/EditorShellAsset.h"
#include <XCEditor/Shell/UIEditorShellInteraction.h>
#include <XCEditor/Foundation/UIEditorShortcutManager.h>
#include <XCEditor/Shell/UIEditorWorkspaceController.h>
#include <XCEditor/Shell/UIEditorStructuredShell.h>
#include <XCEngine/UI/Runtime/UIScreenDocumentHost.h>
#include <XCEngine/UI/Runtime/UIScreenPlayer.h>
@@ -28,44 +24,6 @@
namespace XCEngine::UI::Editor {
struct StructuredEditorShellBinding {
::XCEngine::UI::Runtime::UIScreenAsset screenAsset = {};
UIEditorWorkspaceController workspaceController = {};
UIEditorShellInteractionDefinition shellDefinition = {};
UIEditorShortcutManager shortcutManager = {};
EditorShellAssetValidationResult assetValidation = {};
[[nodiscard]] bool IsValid() const {
return assetValidation.IsValid();
}
};
inline UIEditorShortcutManager BuildStructuredEditorShortcutManager(
const EditorShellAsset& asset) {
return BuildEditorShellShortcutManager(asset);
}
inline StructuredEditorShellBinding BuildStructuredEditorShellBinding(
const EditorShellAsset& asset) {
StructuredEditorShellBinding binding = {};
binding.screenAsset.screenId = asset.screenId;
binding.screenAsset.documentPath = asset.documentPath.string();
binding.workspaceController =
UIEditorWorkspaceController(asset.panelRegistry, asset.workspace, asset.workspaceSession);
binding.shellDefinition = asset.shellDefinition;
binding.shortcutManager = BuildStructuredEditorShortcutManager(asset);
binding.assetValidation = ValidateEditorShellAsset(asset);
return binding;
}
inline UIEditorShellInteractionServices BuildStructuredEditorShellServices(
const StructuredEditorShellBinding& binding) {
UIEditorShellInteractionServices services = {};
services.commandDispatcher = &binding.shortcutManager.GetCommandDispatcher();
services.shortcutManager = &binding.shortcutManager;
return services;
}
class Application {
public:
Application();

3
new_editor/src/Shell/EditorShellAsset.h → new_editor/include/XCEditor/Shell/UIEditorShellAsset.h
View File

@@ -1,6 +1,7 @@
#pragma once
#include <XCEditor/Foundation/UIEditorShortcutManager.h>
#include <XCEditor/Shell/UIEditorMenuModel.h>
#include <XCEditor/Shell/UIEditorPanelRegistry.h>
#include <XCEditor/Shell/UIEditorShellInteraction.h>
#include <XCEditor/Shell/UIEditorWorkspaceModel.h>
@@ -15,7 +16,7 @@ namespace XCEngine::UI::Editor {
struct EditorShellShortcutAsset {
UIEditorCommandRegistry commandRegistry = {};
std::vector<XCEngine::UI::UIShortcutBinding> bindings = {};
std::vector<UIShortcutBinding> bindings = {};
};
struct EditorShellAsset {

45
new_editor/include/XCEditor/Shell/UIEditorStructuredShell.h Normal file
View File

@@ -0,0 +1,45 @@
#pragma once
#include <XCEditor/Foundation/UIEditorShortcutManager.h>
#include <XCEditor/Shell/UIEditorShellAsset.h>
#include <XCEditor/Shell/UIEditorShellInteraction.h>
#include <XCEditor/Shell/UIEditorWorkspaceController.h>
#include <XCEngine/UI/Runtime/UIScreenTypes.h>
namespace XCEngine::UI::Editor {
struct StructuredEditorShellBinding {
::XCEngine::UI::Runtime::UIScreenAsset screenAsset = {};
UIEditorWorkspaceController workspaceController = {};
UIEditorShellInteractionDefinition shellDefinition = {};
UIEditorShortcutManager shortcutManager = {};
EditorShellAssetValidationResult assetValidation = {};
[[nodiscard]] bool IsValid() const {
return assetValidation.IsValid();
}
};
inline StructuredEditorShellBinding BuildStructuredEditorShellBinding(
const EditorShellAsset& asset) {
StructuredEditorShellBinding binding = {};
binding.screenAsset.screenId = asset.screenId;
binding.screenAsset.documentPath = asset.documentPath.string();
binding.workspaceController =
UIEditorWorkspaceController(asset.panelRegistry, asset.workspace, asset.workspaceSession);
binding.shellDefinition = asset.shellDefinition;
binding.shortcutManager = BuildEditorShellShortcutManager(asset);
binding.assetValidation = ValidateEditorShellAsset(asset);
return binding;
}
inline UIEditorShellInteractionServices BuildStructuredEditorShellServices(
const StructuredEditorShellBinding& binding) {
UIEditorShellInteractionServices services = {};
services.commandDispatcher = &binding.shortcutManager.GetCommandDispatcher();
services.shortcutManager = &binding.shortcutManager;
return services;
}
} // namespace XCEngine::UI::Editor

2
new_editor/src/Shell/EditorShellAsset.cpp → new_editor/src/Shell/UIEditorShellAsset.cpp
View File

@@ -1,4 +1,4 @@
#include "EditorShellAsset.h"
#include <XCEditor/Shell/UIEditorShellAsset.h>
#include <unordered_set>
#include <utility>

7
new_editor/ui/views/editor_shell.xcui
View File

@@ -1,7 +0,0 @@
<View
name="EditorShell">
<Column
id="editor-foundation-root"
width="fill"
height="fill" />
</View>

11
tests/UI/Editor/CMakeLists.txt
View File

@@ -2,6 +2,17 @@ cmake_minimum_required(VERSION 3.15)
project(XCEngine_EditorUITests)
set(XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT
"${CMAKE_SOURCE_DIR}/new_editor")
if(NOT EXISTS "${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/Host/AutoScreenshot.h"
OR NOT EXISTS "${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/Host/InputModifierTracker.h"
OR NOT EXISTS "${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/Host/NativeRenderer.h")
message(FATAL_ERROR
"Editor UI tests expect host headers under "
"${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/Host.")
endif()
add_subdirectory(unit)
add_subdirectory(integration)

5
tests/UI/Editor/integration/shared/CMakeLists.txt
View File

@@ -29,9 +29,8 @@ target_include_directories(editor_ui_integration_host
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/src
${CMAKE_SOURCE_DIR}/engine/include
${CMAKE_SOURCE_DIR}/new_editor/include
${CMAKE_SOURCE_DIR}/new_editor/app
${CMAKE_SOURCE_DIR}/new_editor/src
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}
)
target_compile_definitions(editor_ui_integration_host

4
tests/UI/Editor/integration/shell/asset_field_basic/CMakeLists.txt
View File

@@ -4,8 +4,8 @@ add_executable(editor_ui_asset_field_basic_validation WIN32
target_include_directories(editor_ui_asset_field_basic_validation PRIVATE
${CMAKE_SOURCE_DIR}/tests/UI/Editor/integration/shared/src
${CMAKE_SOURCE_DIR}/new_editor/include
${CMAKE_SOURCE_DIR}/new_editor/app
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}
${CMAKE_SOURCE_DIR}/engine/include
)

4
tests/UI/Editor/integration/shell/bool_field_basic/CMakeLists.txt
View File

@@ -4,8 +4,8 @@ add_executable(editor_ui_bool_field_basic_validation WIN32
target_include_directories(editor_ui_bool_field_basic_validation PRIVATE
${CMAKE_SOURCE_DIR}/tests/UI/Editor/integration/shared/src
${CMAKE_SOURCE_DIR}/new_editor/include
${CMAKE_SOURCE_DIR}/new_editor/app
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}
${CMAKE_SOURCE_DIR}/engine/include
)

4
tests/UI/Editor/integration/shell/color_field_basic/CMakeLists.txt
View File

@@ -4,8 +4,8 @@ add_executable(editor_ui_color_field_basic_validation WIN32
target_include_directories(editor_ui_color_field_basic_validation PRIVATE
${CMAKE_SOURCE_DIR}/tests/UI/Editor/integration/shared/src
${CMAKE_SOURCE_DIR}/new_editor/include
${CMAKE_SOURCE_DIR}/new_editor/app
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}
${CMAKE_SOURCE_DIR}/engine/include
)

5
tests/UI/Editor/integration/shell/context_menu_basic/CMakeLists.txt
View File

@@ -4,9 +4,8 @@ add_executable(editor_ui_context_menu_basic_validation WIN32
target_include_directories(editor_ui_context_menu_basic_validation PRIVATE
${CMAKE_SOURCE_DIR}/engine/include
${CMAKE_SOURCE_DIR}/new_editor/include
${CMAKE_SOURCE_DIR}/new_editor/app
${CMAKE_SOURCE_DIR}/new_editor/src
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}
)
target_compile_definitions(editor_ui_context_menu_basic_validation PRIVATE

4
tests/UI/Editor/integration/shell/dock_host_basic/CMakeLists.txt
View File

@@ -3,8 +3,8 @@ add_executable(editor_ui_dock_host_basic_validation WIN32
)
target_include_directories(editor_ui_dock_host_basic_validation PRIVATE
${CMAKE_SOURCE_DIR}/new_editor/include
${CMAKE_SOURCE_DIR}/new_editor/app
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}
${CMAKE_SOURCE_DIR}/engine/include
)

4
tests/UI/Editor/integration/shell/editor_shell_compose/CMakeLists.txt
View File

@@ -3,8 +3,8 @@ add_executable(editor_ui_editor_shell_compose_validation WIN32
)
target_include_directories(editor_ui_editor_shell_compose_validation PRIVATE
${CMAKE_SOURCE_DIR}/new_editor/include
${CMAKE_SOURCE_DIR}/new_editor/app
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}
${CMAKE_SOURCE_DIR}/engine/include
)

5
tests/UI/Editor/integration/shell/editor_shell_interaction/CMakeLists.txt
View File

@@ -4,9 +4,8 @@ add_executable(editor_ui_editor_shell_interaction_validation WIN32
target_include_directories(editor_ui_editor_shell_interaction_validation PRIVATE
${CMAKE_SOURCE_DIR}/engine/include
${CMAKE_SOURCE_DIR}/new_editor/include
${CMAKE_SOURCE_DIR}/new_editor/app
${CMAKE_SOURCE_DIR}/new_editor/src
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}
)
target_compile_definitions(editor_ui_editor_shell_interaction_validation PRIVATE

2
tests/UI/Editor/integration/shell/editor_shell_interaction/main.cpp
View File

@@ -2,7 +2,7 @@
#define NOMINMAX
#endif
#include "Shell/EditorShellAsset.h"
#include <XCEditor/Shell/UIEditorShellAsset.h>
#include <XCEditor/Foundation/UIEditorCommandDispatcher.h>
#include <XCEditor/Foundation/UIEditorTheme.h>

4
tests/UI/Editor/integration/shell/enum_field_basic/CMakeLists.txt
View File

@@ -4,8 +4,8 @@ add_executable(editor_ui_enum_field_basic_validation WIN32
target_include_directories(editor_ui_enum_field_basic_validation PRIVATE
${CMAKE_SOURCE_DIR}/tests/UI/Editor/integration/shared/src
${CMAKE_SOURCE_DIR}/new_editor/include
${CMAKE_SOURCE_DIR}/new_editor/app
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}
${CMAKE_SOURCE_DIR}/engine/include
)

4
tests/UI/Editor/integration/shell/list_view_basic/CMakeLists.txt
View File

@@ -3,8 +3,8 @@ add_executable(editor_ui_list_view_basic_validation WIN32
)
target_include_directories(editor_ui_list_view_basic_validation PRIVATE
${CMAKE_SOURCE_DIR}/new_editor/include
${CMAKE_SOURCE_DIR}/new_editor/app
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}
${CMAKE_SOURCE_DIR}/engine/include
)

4
tests/UI/Editor/integration/shell/list_view_inline_rename/CMakeLists.txt
View File

@@ -3,8 +3,8 @@ add_executable(editor_ui_list_view_inline_rename_validation WIN32
)
target_include_directories(editor_ui_list_view_inline_rename_validation PRIVATE
${CMAKE_SOURCE_DIR}/new_editor/include
${CMAKE_SOURCE_DIR}/new_editor/app
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}
${CMAKE_SOURCE_DIR}/engine/include
${CMAKE_SOURCE_DIR}/tests/UI/Editor/integration/shared/src
)

4
tests/UI/Editor/integration/shell/list_view_multiselect/CMakeLists.txt
View File

@@ -4,8 +4,8 @@ add_executable(editor_ui_list_view_multiselect_validation WIN32
target_include_directories(editor_ui_list_view_multiselect_validation PRIVATE
${CMAKE_SOURCE_DIR}/tests/UI/Editor/integration/shared/src
${CMAKE_SOURCE_DIR}/new_editor/include
${CMAKE_SOURCE_DIR}/new_editor/app
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}
${CMAKE_SOURCE_DIR}/engine/include
)

5
tests/UI/Editor/integration/shell/menu_bar_basic/CMakeLists.txt
View File

@@ -4,9 +4,8 @@ add_executable(editor_ui_menu_bar_basic_validation WIN32
target_include_directories(editor_ui_menu_bar_basic_validation PRIVATE
${CMAKE_SOURCE_DIR}/engine/include
${CMAKE_SOURCE_DIR}/new_editor/include
${CMAKE_SOURCE_DIR}/new_editor/app
${CMAKE_SOURCE_DIR}/new_editor/src
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}
)
target_compile_definitions(editor_ui_menu_bar_basic_validation PRIVATE

4
tests/UI/Editor/integration/shell/number_field_basic/CMakeLists.txt
View File

@@ -4,8 +4,8 @@ add_executable(editor_ui_number_field_basic_validation WIN32
target_include_directories(editor_ui_number_field_basic_validation PRIVATE
${CMAKE_SOURCE_DIR}/tests/UI/Editor/integration/shared/src
${CMAKE_SOURCE_DIR}/new_editor/include
${CMAKE_SOURCE_DIR}/new_editor/app
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}
${CMAKE_SOURCE_DIR}/engine/include
)

4
tests/UI/Editor/integration/shell/object_field_basic/CMakeLists.txt
View File

@@ -4,8 +4,8 @@ add_executable(editor_ui_object_field_basic_validation WIN32
target_include_directories(editor_ui_object_field_basic_validation PRIVATE
${CMAKE_SOURCE_DIR}/tests/UI/Editor/integration/shared/src
${CMAKE_SOURCE_DIR}/new_editor/include
${CMAKE_SOURCE_DIR}/new_editor/app
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}
${CMAKE_SOURCE_DIR}/engine/include
)

5
tests/UI/Editor/integration/shell/panel_content_host_basic/CMakeLists.txt
View File

@@ -4,9 +4,8 @@ add_executable(editor_ui_panel_content_host_basic_validation WIN32
target_include_directories(editor_ui_panel_content_host_basic_validation PRIVATE
${CMAKE_SOURCE_DIR}/engine/include
${CMAKE_SOURCE_DIR}/new_editor/include
${CMAKE_SOURCE_DIR}/new_editor/app
${CMAKE_SOURCE_DIR}/new_editor/src
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}
)
target_compile_definitions(editor_ui_panel_content_host_basic_validation PRIVATE

4
tests/UI/Editor/integration/shell/panel_frame_basic/CMakeLists.txt
View File

@@ -3,8 +3,8 @@ add_executable(editor_ui_panel_frame_basic_validation WIN32
)
target_include_directories(editor_ui_panel_frame_basic_validation PRIVATE
${CMAKE_SOURCE_DIR}/new_editor/include
${CMAKE_SOURCE_DIR}/new_editor/app
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}
${CMAKE_SOURCE_DIR}/engine/include
)

4
tests/UI/Editor/integration/shell/property_grid_basic/CMakeLists.txt
View File

@@ -4,8 +4,8 @@ add_executable(editor_ui_property_grid_basic_validation WIN32
target_include_directories(editor_ui_property_grid_basic_validation PRIVATE
${CMAKE_SOURCE_DIR}/tests/UI/Editor/integration/shared/src
${CMAKE_SOURCE_DIR}/new_editor/include
${CMAKE_SOURCE_DIR}/new_editor/app
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}
${CMAKE_SOURCE_DIR}/engine/include
)

4
tests/UI/Editor/integration/shell/scroll_view_basic/CMakeLists.txt
View File

@@ -3,8 +3,8 @@ add_executable(editor_ui_scroll_view_basic_validation WIN32
)
target_include_directories(editor_ui_scroll_view_basic_validation PRIVATE
${CMAKE_SOURCE_DIR}/new_editor/include
${CMAKE_SOURCE_DIR}/new_editor/app
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}
${CMAKE_SOURCE_DIR}/engine/include
)

4
tests/UI/Editor/integration/shell/status_bar_basic/CMakeLists.txt
View File

@@ -3,8 +3,8 @@ add_executable(editor_ui_status_bar_basic_validation WIN32
)
target_include_directories(editor_ui_status_bar_basic_validation PRIVATE
${CMAKE_SOURCE_DIR}/new_editor/include
${CMAKE_SOURCE_DIR}/new_editor/app
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}
${CMAKE_SOURCE_DIR}/engine/include
)

4
tests/UI/Editor/integration/shell/tab_strip_basic/CMakeLists.txt
View File

@@ -3,8 +3,8 @@ add_executable(editor_ui_tab_strip_basic_validation WIN32
)
target_include_directories(editor_ui_tab_strip_basic_validation PRIVATE
${CMAKE_SOURCE_DIR}/new_editor/include
${CMAKE_SOURCE_DIR}/new_editor/app
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}
${CMAKE_SOURCE_DIR}/engine/include
)

4
tests/UI/Editor/integration/shell/text_field_basic/CMakeLists.txt
View File

@@ -4,8 +4,8 @@ add_executable(editor_ui_text_field_basic_validation WIN32
target_include_directories(editor_ui_text_field_basic_validation PRIVATE
${CMAKE_SOURCE_DIR}/tests/UI/Editor/integration/shared/src
${CMAKE_SOURCE_DIR}/new_editor/include
${CMAKE_SOURCE_DIR}/new_editor/app
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}
${CMAKE_SOURCE_DIR}/engine/include
)

4
tests/UI/Editor/integration/shell/tree_view_basic/CMakeLists.txt
View File

@@ -3,8 +3,8 @@ add_executable(editor_ui_tree_view_basic_validation WIN32
)
target_include_directories(editor_ui_tree_view_basic_validation PRIVATE
${CMAKE_SOURCE_DIR}/new_editor/include
${CMAKE_SOURCE_DIR}/new_editor/app
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}
${CMAKE_SOURCE_DIR}/engine/include
)

4
tests/UI/Editor/integration/shell/tree_view_inline_rename/CMakeLists.txt
View File

@@ -3,8 +3,8 @@ add_executable(editor_ui_tree_view_inline_rename_validation WIN32
)
target_include_directories(editor_ui_tree_view_inline_rename_validation PRIVATE
${CMAKE_SOURCE_DIR}/new_editor/include
${CMAKE_SOURCE_DIR}/new_editor/app
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}
${CMAKE_SOURCE_DIR}/engine/include
${CMAKE_SOURCE_DIR}/tests/UI/Editor/integration/shared/src
)

4
tests/UI/Editor/integration/shell/tree_view_multiselect/CMakeLists.txt
View File

@@ -3,8 +3,8 @@ add_executable(editor_ui_tree_view_multiselect_validation WIN32
)
target_include_directories(editor_ui_tree_view_multiselect_validation PRIVATE
${CMAKE_SOURCE_DIR}/new_editor/include
${CMAKE_SOURCE_DIR}/new_editor/app
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}
${CMAKE_SOURCE_DIR}/engine/include
)

4
tests/UI/Editor/integration/shell/vector2_field_basic/CMakeLists.txt
View File

@@ -4,8 +4,8 @@ add_executable(editor_ui_vector2_field_basic_validation WIN32
target_include_directories(editor_ui_vector2_field_basic_validation PRIVATE
${CMAKE_SOURCE_DIR}/tests/UI/Editor/integration/shared/src
${CMAKE_SOURCE_DIR}/new_editor/include
${CMAKE_SOURCE_DIR}/new_editor/app
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}
${CMAKE_SOURCE_DIR}/engine/include
)

4
tests/UI/Editor/integration/shell/vector3_field_basic/CMakeLists.txt
View File

@@ -4,8 +4,8 @@ add_executable(editor_ui_vector3_field_basic_validation WIN32
target_include_directories(editor_ui_vector3_field_basic_validation PRIVATE
${CMAKE_SOURCE_DIR}/tests/UI/Editor/integration/shared/src
${CMAKE_SOURCE_DIR}/new_editor/include
${CMAKE_SOURCE_DIR}/new_editor/app
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}
${CMAKE_SOURCE_DIR}/engine/include
)

4
tests/UI/Editor/integration/shell/vector4_field_basic/CMakeLists.txt
View File

@@ -4,8 +4,8 @@ add_executable(editor_ui_vector4_field_basic_validation WIN32
target_include_directories(editor_ui_vector4_field_basic_validation PRIVATE
${CMAKE_SOURCE_DIR}/tests/UI/Editor/integration/shared/src
${CMAKE_SOURCE_DIR}/new_editor/include
${CMAKE_SOURCE_DIR}/new_editor/app
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}
${CMAKE_SOURCE_DIR}/engine/include
)

4
tests/UI/Editor/integration/shell/viewport_shell_basic/CMakeLists.txt
View File

@@ -3,8 +3,8 @@ add_executable(editor_ui_viewport_shell_basic_validation WIN32
)
target_include_directories(editor_ui_viewport_shell_basic_validation PRIVATE
${CMAKE_SOURCE_DIR}/new_editor/include
${CMAKE_SOURCE_DIR}/new_editor/app
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}
${CMAKE_SOURCE_DIR}/engine/include
)

4
tests/UI/Editor/integration/shell/viewport_slot_basic/CMakeLists.txt
View File

@@ -3,8 +3,8 @@ add_executable(editor_ui_viewport_slot_basic_validation WIN32
)
target_include_directories(editor_ui_viewport_slot_basic_validation PRIVATE
${CMAKE_SOURCE_DIR}/new_editor/include
${CMAKE_SOURCE_DIR}/new_editor/app
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}
${CMAKE_SOURCE_DIR}/engine/include
)

4
tests/UI/Editor/integration/shell/workspace_interaction_basic/CMakeLists.txt
View File

@@ -3,8 +3,8 @@ add_executable(editor_ui_workspace_interaction_basic_validation WIN32
)
target_include_directories(editor_ui_workspace_interaction_basic_validation PRIVATE
${CMAKE_SOURCE_DIR}/new_editor/include
${CMAKE_SOURCE_DIR}/new_editor/app
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}
${CMAKE_SOURCE_DIR}/engine/include
)

4
tests/UI/Editor/integration/shell/workspace_shell_compose/CMakeLists.txt
View File

@@ -3,8 +3,8 @@ add_executable(editor_ui_workspace_shell_compose_validation WIN32
)
target_include_directories(editor_ui_workspace_shell_compose_validation PRIVATE
${CMAKE_SOURCE_DIR}/new_editor/include
${CMAKE_SOURCE_DIR}/new_editor/app
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}
${CMAKE_SOURCE_DIR}/engine/include
)

4
tests/UI/Editor/integration/shell/workspace_viewport_compose/CMakeLists.txt
View File

@@ -3,8 +3,8 @@ add_executable(editor_ui_workspace_viewport_compose_validation WIN32
)
target_include_directories(editor_ui_workspace_viewport_compose_validation PRIVATE
${CMAKE_SOURCE_DIR}/new_editor/include
${CMAKE_SOURCE_DIR}/new_editor/app
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}
${CMAKE_SOURCE_DIR}/engine/include
)

5
tests/UI/Editor/integration/state/layout_persistence/CMakeLists.txt
View File

@@ -4,9 +4,8 @@ add_executable(editor_ui_layout_persistence_validation WIN32
target_include_directories(editor_ui_layout_persistence_validation PRIVATE
${CMAKE_SOURCE_DIR}/engine/include
${CMAKE_SOURCE_DIR}/new_editor/include
${CMAKE_SOURCE_DIR}/new_editor/app
${CMAKE_SOURCE_DIR}/new_editor/src
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}
)
target_compile_definitions(editor_ui_layout_persistence_validation PRIVATE

5
tests/UI/Editor/integration/state/panel_host_lifecycle/CMakeLists.txt
View File

@@ -4,9 +4,8 @@ add_executable(editor_ui_panel_host_lifecycle_validation WIN32
target_include_directories(editor_ui_panel_host_lifecycle_validation PRIVATE
${CMAKE_SOURCE_DIR}/engine/include
${CMAKE_SOURCE_DIR}/new_editor/include
${CMAKE_SOURCE_DIR}/new_editor/app
${CMAKE_SOURCE_DIR}/new_editor/src
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}
)
target_compile_definitions(editor_ui_panel_host_lifecycle_validation PRIVATE

5
tests/UI/Editor/integration/state/panel_session_flow/CMakeLists.txt
View File

@@ -4,9 +4,8 @@ add_executable(editor_ui_panel_session_flow_validation WIN32
target_include_directories(editor_ui_panel_session_flow_validation PRIVATE
${CMAKE_SOURCE_DIR}/engine/include
${CMAKE_SOURCE_DIR}/new_editor/include
${CMAKE_SOURCE_DIR}/new_editor/app
${CMAKE_SOURCE_DIR}/new_editor/src
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}
)
target_compile_definitions(editor_ui_panel_session_flow_validation PRIVATE

5
tests/UI/Editor/integration/state/shortcut_dispatch/CMakeLists.txt
View File

@@ -4,9 +4,8 @@ add_executable(editor_ui_shortcut_dispatch_validation WIN32
target_include_directories(editor_ui_shortcut_dispatch_validation PRIVATE
${CMAKE_SOURCE_DIR}/engine/include
${CMAKE_SOURCE_DIR}/new_editor/include
${CMAKE_SOURCE_DIR}/new_editor/app
${CMAKE_SOURCE_DIR}/new_editor/src
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}
)
target_compile_definitions(editor_ui_shortcut_dispatch_validation PRIVATE

4
tests/UI/Editor/integration/state/viewport_input_bridge_basic/CMakeLists.txt
View File

@@ -3,8 +3,8 @@ add_executable(editor_ui_viewport_input_bridge_basic_validation WIN32
)
target_include_directories(editor_ui_viewport_input_bridge_basic_validation PRIVATE
${CMAKE_SOURCE_DIR}/new_editor/include
${CMAKE_SOURCE_DIR}/new_editor/app
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}
${CMAKE_SOURCE_DIR}/engine/include
)

5
tests/UI/Editor/unit/CMakeLists.txt
View File

@@ -73,9 +73,8 @@ target_link_libraries(editor_ui_tests
target_include_directories(editor_ui_tests
PRIVATE
${CMAKE_SOURCE_DIR}/new_editor/include
${CMAKE_SOURCE_DIR}/new_editor/src
${CMAKE_SOURCE_DIR}/new_editor/app
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}/include
${XCENGINE_EDITOR_UI_TESTS_EDITOR_ROOT}
${CMAKE_SOURCE_DIR}/engine/include
)

2
tests/UI/Editor/unit/test_editor_shell_asset_validation.cpp
View File

@@ -1,6 +1,6 @@
#include <gtest/gtest.h>
#include "Shell/EditorShellAsset.h"
#include <XCEditor/Shell/UIEditorShellAsset.h>
#include <XCEditor/Shell/UIEditorPanelRegistry.h>

4
tests/UI/Editor/unit/test_structured_editor_shell.cpp
View File

@@ -1,7 +1,7 @@
#include <gtest/gtest.h>
#include "Application.h"
#include <XCEditor/Shell/UIEditorShellAsset.h>
#include <XCEditor/Shell/UIEditorStructuredShell.h>
#include <XCEditor/Shell/UIEditorShellInteraction.h>
#include <XCEditor/Shell/UIEditorWorkspaceModel.h>
#include <XCEditor/Shell/UIEditorWorkspaceSession.h>