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

engine: sync editor rendering and ui changes

Browse Source
This commit is contained in:
ssdfasd
2026-04-08 16:09:15 +08:00
parent 31756847ab
commit 162f1cc12e
153 changed files with 4454 additions and 2990 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/UI/Core/integration/CMakeLists.txt
View File

@@ -1,6 +1,7 @@
add_subdirectory(shared)
add_subdirectory(input)
add_subdirectory(layout)
add_subdirectory(render)
add_subdirectory(style)
add_subdirectory(text)
@@ -8,6 +9,7 @@ add_custom_target(core_ui_integration_tests
DEPENDS
core_ui_input_integration_tests
core_ui_layout_integration_tests
core_ui_render_integration_tests
core_ui_style_integration_tests
core_ui_text_integration_tests
)

6
tests/UI/Core/integration/render/CMakeLists.txt Normal file
View File

@@ -0,0 +1,6 @@
add_subdirectory(draw_primitives_basic)
add_custom_target(core_ui_render_integration_tests
DEPENDS
core_ui_render_draw_primitives_basic_validation
)

27
tests/UI/Core/integration/render/draw_primitives_basic/CMakeLists.txt Normal file
View File

@@ -0,0 +1,27 @@
add_executable(core_ui_render_draw_primitives_basic_validation WIN32
main.cpp
)
target_include_directories(core_ui_render_draw_primitives_basic_validation PRIVATE
${CMAKE_SOURCE_DIR}/tests/UI/Core/integration/shared/src
${CMAKE_SOURCE_DIR}/engine/include
)
target_compile_definitions(core_ui_render_draw_primitives_basic_validation PRIVATE
UNICODE
_UNICODE
)
if(MSVC)
target_compile_options(core_ui_render_draw_primitives_basic_validation PRIVATE /utf-8 /FS)
set_property(TARGET core_ui_render_draw_primitives_basic_validation PROPERTY
MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
endif()
target_link_libraries(core_ui_render_draw_primitives_basic_validation PRIVATE
core_ui_integration_host
)
set_target_properties(core_ui_render_draw_primitives_basic_validation PROPERTIES
OUTPUT_NAME "XCUICoreRenderDrawPrimitivesBasicValidation"
)

465
tests/UI/Core/integration/render/draw_primitives_basic/main.cpp Normal file
View File

@@ -0,0 +1,465 @@
#ifndef NOMINMAX
#define NOMINMAX
#endif
#include "AutoScreenshot.h"
#include "NativeRenderer.h"
#include <XCEngine/UI/DrawData.h>
#include <windows.h>
#include <algorithm>
#include <cmath>
#include <cstdlib>
#include <filesystem>
#include <string>
#ifndef XCENGINE_CORE_UI_TESTS_REPO_ROOT
#define XCENGINE_CORE_UI_TESTS_REPO_ROOT "."
#endif
namespace {
using XCEngine::Tests::CoreUI::Host::AutoScreenshotController;
using XCEngine::Tests::CoreUI::Host::NativeRenderer;
using XCEngine::UI::UIColor;
using XCEngine::UI::UIDrawData;
using XCEngine::UI::UIDrawList;
using XCEngine::UI::UILinearGradientDirection;
using XCEngine::UI::UIPoint;
using XCEngine::UI::UIRect;
constexpr const wchar_t* kWindowClassName = L"XCUICoreRenderDrawPrimitivesBasicValidation";
constexpr const wchar_t* kWindowTitle = L"XCUI Core | Draw Primitives Basic";
constexpr UIColor kWindowColor(0.09f, 0.09f, 0.09f, 1.0f);
constexpr UIColor kCardColor(0.15f, 0.15f, 0.15f, 1.0f);
constexpr UIColor kCardBorderColor(0.26f, 0.26f, 0.26f, 1.0f);
constexpr UIColor kTitleColor(0.95f, 0.95f, 0.95f, 1.0f);
constexpr UIColor kBodyColor(0.82f, 0.82f, 0.82f, 1.0f);
constexpr UIColor kMutedColor(0.64f, 0.64f, 0.64f, 1.0f);
constexpr UIColor kCheckerLight(0.74f, 0.74f, 0.74f, 1.0f);
constexpr UIColor kCheckerDark(0.46f, 0.46f, 0.46f, 1.0f);
struct ScenarioLayout {
UIRect introRect = {};
UIRect stateRect = {};
UIRect previewRect = {};
UIRect gradientRowRect = {};
UIRect svRect = {};
UIRect hueStripRect = {};
UIRect closeButtonRect = {};
UIRect alphaPreviewRect = {};
};
std::filesystem::path ResolveRepoRootPath() {
std::string root = XCENGINE_CORE_UI_TESTS_REPO_ROOT;
if (root.size() >= 2u && root.front() == '"' && root.back() == '"') {
root = root.substr(1u, root.size() - 2u);
}
return std::filesystem::path(root).lexically_normal();
}
ScenarioLayout BuildScenarioLayout(float width, float height) {
constexpr float margin = 20.0f;
constexpr float gap = 16.0f;
constexpr float leftWidth = 430.0f;
ScenarioLayout layout = {};
layout.introRect = UIRect(margin, margin, leftWidth, 220.0f);
layout.stateRect = UIRect(
margin,
layout.introRect.y + layout.introRect.height + gap,
leftWidth,
(std::max)(240.0f, height - layout.introRect.height - gap - margin * 2.0f));
layout.previewRect = UIRect(
margin * 2.0f + leftWidth,
margin,
(std::max)(460.0f, width - leftWidth - margin * 3.0f),
height - margin * 2.0f);
const float contentX = layout.previewRect.x + 24.0f;
const float contentY = layout.previewRect.y + 58.0f;
layout.gradientRowRect = UIRect(contentX, contentY, 360.0f, 24.0f);
layout.svRect = UIRect(contentX, contentY + 52.0f, 208.0f, 208.0f);
layout.hueStripRect = UIRect(layout.svRect.x + layout.svRect.width + 18.0f, layout.svRect.y, 28.0f, layout.svRect.height);
layout.alphaPreviewRect = UIRect(layout.hueStripRect.x + layout.hueStripRect.width + 26.0f, layout.svRect.y, 96.0f, 48.0f);
layout.closeButtonRect = UIRect(
layout.previewRect.x + layout.previewRect.width - 42.0f,
layout.previewRect.y + 18.0f,
20.0f,
20.0f);
return layout;
}
bool ShouldAutoCaptureOnStartup() {
const char* value = std::getenv("XCUI_AUTO_CAPTURE_ON_STARTUP");
return value != nullptr && value[0] == '1' && value[1] == '\0';
}
void DrawCard(UIDrawList& drawList, const UIRect& rect) {
drawList.AddFilledRect(rect, kCardColor, 8.0f);
drawList.AddRectOutline(rect, kCardBorderColor, 1.0f, 8.0f);
}
void DrawCheckerboard(UIDrawList& drawList, const UIRect& rect, float cellSize) {
const int columns = static_cast<int>(std::ceil(rect.width / cellSize));
const int rows = static_cast<int>(std::ceil(rect.height / cellSize));
for (int row = 0; row < rows; ++row) {
for (int column = 0; column < columns; ++column) {
const bool light = ((row + column) & 1) == 0;
const float x = rect.x + cellSize * static_cast<float>(column);
const float y = rect.y + cellSize * static_cast<float>(row);
drawList.AddFilledRect(
UIRect(
x,
y,
(std::min)(cellSize, rect.x + rect.width - x),
(std::min)(cellSize, rect.y + rect.height - y)),
light ? kCheckerLight : kCheckerDark);
}
}
}
class ScenarioApp {
public:
int Run(HINSTANCE hInstance, int nCmdShow) {
if (!Initialize(hInstance, nCmdShow)) {
Shutdown();
return 1;
}
MSG message = {};
while (message.message != WM_QUIT) {
if (PeekMessageW(&message, nullptr, 0U, 0U, PM_REMOVE)) {
TranslateMessage(&message);
DispatchMessageW(&message);
continue;
}
RenderFrame();
Sleep(8);
}
Shutdown();
return static_cast<int>(message.wParam);
}
private:
static LRESULT CALLBACK WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) {
if (message == WM_NCCREATE) {
const auto* createStruct = reinterpret_cast<CREATESTRUCTW*>(lParam);
auto* app = reinterpret_cast<ScenarioApp*>(createStruct->lpCreateParams);
SetWindowLongPtrW(hwnd, GWLP_USERDATA, reinterpret_cast<LONG_PTR>(app));
return TRUE;
}
auto* app = reinterpret_cast<ScenarioApp*>(GetWindowLongPtrW(hwnd, GWLP_USERDATA));
switch (message) {
case WM_SIZE:
if (app != nullptr && wParam != SIZE_MINIMIZED) {
app->m_renderer.Resize(static_cast<UINT>(LOWORD(lParam)), static_cast<UINT>(HIWORD(lParam)));
}
return 0;
case WM_KEYDOWN:
case WM_SYSKEYDOWN:
if (app != nullptr) {
if (wParam == VK_F12) {
app->m_autoScreenshot.RequestCapture("manual_f12");
app->m_lastStatus = "已请求截图，输出到 captures/latest.png";
InvalidateRect(hwnd, nullptr, FALSE);
return 0;
}
if (wParam == 'R') {
app->ResetScenario();
InvalidateRect(hwnd, nullptr, FALSE);
return 0;
}
}
break;
case WM_PAINT:
if (app != nullptr) {
PAINTSTRUCT paintStruct = {};
BeginPaint(hwnd, &paintStruct);
app->RenderFrame();
EndPaint(hwnd, &paintStruct);
return 0;
}
break;
case WM_ERASEBKGND:
return 1;
case WM_DESTROY:
if (app != nullptr) {
app->m_hwnd = nullptr;
}
PostQuitMessage(0);
return 0;
default:
break;
}
return DefWindowProcW(hwnd, message, wParam, lParam);
}
bool Initialize(HINSTANCE hInstance, int nCmdShow) {
WNDCLASSEXW windowClass = {};
windowClass.cbSize = sizeof(windowClass);
windowClass.style = CS_HREDRAW | CS_VREDRAW;
windowClass.lpfnWndProc = &ScenarioApp::WndProc;
windowClass.hInstance = hInstance;
windowClass.hCursor = LoadCursorW(nullptr, IDC_ARROW);
windowClass.lpszClassName = kWindowClassName;
m_windowClassAtom = RegisterClassExW(&windowClass);
if (m_windowClassAtom == 0) {
return false;
}
m_hwnd = CreateWindowExW(
0,
kWindowClassName,
kWindowTitle,
WS_OVERLAPPEDWINDOW | WS_VISIBLE,
CW_USEDEFAULT,
CW_USEDEFAULT,
1440,
920,
nullptr,
nullptr,
hInstance,
this);
if (m_hwnd == nullptr || !m_renderer.Initialize(m_hwnd)) {
return false;
}
ShowWindow(m_hwnd, nCmdShow);
UpdateWindow(m_hwnd);
m_captureRoot =
ResolveRepoRootPath() / "tests/UI/Core/integration/render/draw_primitives_basic/captures";
m_autoScreenshot.Initialize(m_captureRoot);
ResetScenario();
if (ShouldAutoCaptureOnStartup()) {
m_autoScreenshot.RequestCapture("startup");
m_lastStatus = "已请求启动截图";
}
return true;
}
void Shutdown() {
m_autoScreenshot.Shutdown();
m_renderer.Shutdown();
if (m_hwnd != nullptr && IsWindow(m_hwnd)) {
DestroyWindow(m_hwnd);
}
if (m_windowClassAtom != 0) {
UnregisterClassW(kWindowClassName, GetModuleHandleW(nullptr));
}
}
void ResetScenario() {
m_lastStatus = "已重置到默认 Draw Primitives 场景";
}
void RenderFrame() {
RECT clientRect = {};
GetClientRect(m_hwnd, &clientRect);
const float width = static_cast<float>((std::max)(1L, clientRect.right - clientRect.left));
const float height = static_cast<float>((std::max)(1L, clientRect.bottom - clientRect.top));
const ScenarioLayout layout = BuildScenarioLayout(width, height);
UIDrawData drawData = {};
UIDrawList& drawList = drawData.EmplaceDrawList("CoreDrawPrimitives");
drawList.AddFilledRect(UIRect(0.0f, 0.0f, width, height), kWindowColor);
DrawCard(drawList, layout.introRect);
DrawCard(drawList, layout.stateRect);
DrawCard(drawList, layout.previewRect);
drawList.AddText(
UIPoint(layout.introRect.x + 16.0f, layout.introRect.y + 14.0f),
"这个测试在验证什么功能？",
kTitleColor,
17.0f);
drawList.AddText(
UIPoint(layout.introRect.x + 16.0f, layout.introRect.y + 40.0f),
"只验证 UI Core 新增的 linear gradient / line / circle primitive 的真实渲染。",
kMutedColor,
12.0f);
drawList.AddText(
UIPoint(layout.introRect.x + 16.0f, layout.introRect.y + 74.0f),
"1. 右侧横向和纵向 gradient 不能出现纯色退化或明显断层。",
kBodyColor,
12.0f);
drawList.AddText(
UIPoint(layout.introRect.x + 16.0f, layout.introRect.y + 96.0f),
"2. SV 方块应由两层 gradient 叠加；白到主色、再由透明到黑。",
kBodyColor,
12.0f);
drawList.AddText(
UIPoint(layout.introRect.x + 16.0f, layout.introRect.y + 118.0f),
"3. 手柄必须是圆形；关闭按钮 X 和标尺都必须是 line，不准用文字假冒。",
kBodyColor,
12.0f);
drawList.AddText(
UIPoint(layout.introRect.x + 16.0f, layout.introRect.y + 140.0f),
"4. 按 F12 手动截图；设置 XCUI_AUTO_CAPTURE_ON_STARTUP=1 可自动截图；按 R 重置。",
kBodyColor,
12.0f);
drawList.AddText(
UIPoint(layout.stateRect.x + 16.0f, layout.stateRect.y + 14.0f),
"状态摘要",
kTitleColor,
17.0f);
drawList.AddText(
UIPoint(layout.stateRect.x + 16.0f, layout.stateRect.y + 44.0f),
"Primitive: FilledRectLinearGradient / Line / FilledCircle / CircleOutline",
kBodyColor,
12.0f);
drawList.AddText(
UIPoint(layout.stateRect.x + 16.0f, layout.stateRect.y + 68.0f),
"Preview: Gradient Row + SV Square + Hue Strip + Close Button + Alpha Preview",
kBodyColor,
12.0f);
drawList.AddText(
UIPoint(layout.stateRect.x + 16.0f, layout.stateRect.y + 92.0f),
"Result: " + m_lastStatus,
kBodyColor,
12.0f);
drawList.AddText(
UIPoint(layout.stateRect.x + 16.0f, layout.stateRect.y + 116.0f),
m_autoScreenshot.GetLastCaptureSummary().empty()
? std::string("Capture: F12 -> tests/UI/Core/integration/render/draw_primitives_basic/captures/")
: ("Capture: " + m_autoScreenshot.GetLastCaptureSummary()),
kMutedColor,
12.0f);
if (!m_autoScreenshot.GetLastCaptureError().empty()) {
drawList.AddText(
UIPoint(layout.stateRect.x + 16.0f, layout.stateRect.y + 140.0f),
"Error: " + m_autoScreenshot.GetLastCaptureError(),
UIColor(0.95f, 0.56f, 0.56f, 1.0f),
12.0f);
}
drawList.AddText(
UIPoint(layout.previewRect.x + 16.0f, layout.previewRect.y + 14.0f),
"Draw Primitives 预览",
kTitleColor,
17.0f);
drawList.AddText(
UIPoint(layout.previewRect.x + 16.0f, layout.previewRect.y + 36.0f),
"这里不验证 ColorField 业务，只验证底层绘制 primitive 的像素效果。",
kMutedColor,
12.0f);
drawList.AddFilledRectLinearGradient(
layout.gradientRowRect,
UIColor(0.95f, 0.27f, 0.27f, 1.0f),
UIColor(0.14f, 0.72f, 0.94f, 1.0f),
UILinearGradientDirection::Horizontal,
3.0f);
drawList.AddRectOutline(layout.gradientRowRect, UIColor(0.12f, 0.12f, 0.12f, 1.0f), 1.0f, 3.0f);
const float markerX = layout.gradientRowRect.x + layout.gradientRowRect.width * 0.68f;
drawList.AddLine(
UIPoint(markerX, layout.gradientRowRect.y - 2.0f),
UIPoint(markerX, layout.gradientRowRect.y + layout.gradientRowRect.height + 2.0f),
UIColor(1.0f, 1.0f, 1.0f, 1.0f),
2.0f);
drawList.AddFilledRectLinearGradient(
layout.svRect,
UIColor(1.0f, 1.0f, 1.0f, 1.0f),
UIColor(0.23f, 0.64f, 0.98f, 1.0f),
UILinearGradientDirection::Horizontal,
2.0f);
drawList.AddFilledRectLinearGradient(
layout.svRect,
UIColor(0.0f, 0.0f, 0.0f, 0.0f),
UIColor(0.0f, 0.0f, 0.0f, 1.0f),
UILinearGradientDirection::Vertical,
2.0f);
drawList.AddRectOutline(layout.svRect, UIColor(0.12f, 0.12f, 0.12f, 1.0f), 1.0f, 2.0f);
const UIPoint svHandle(
layout.svRect.x + layout.svRect.width * 0.72f,
layout.svRect.y + layout.svRect.height * 0.34f);
drawList.AddFilledCircle(svHandle, 5.0f, UIColor(1.0f, 1.0f, 1.0f, 0.15f));
drawList.AddCircleOutline(svHandle, 7.0f, UIColor(1.0f, 1.0f, 1.0f, 1.0f), 2.0f);
drawList.AddCircleOutline(svHandle, 8.0f, UIColor(0.0f, 0.0f, 0.0f, 0.35f), 1.0f);
const float segmentHeight = layout.hueStripRect.height / 6.0f;
const UIColor hueStops[7] = {
UIColor(1.0f, 0.0f, 0.0f, 1.0f),
UIColor(1.0f, 1.0f, 0.0f, 1.0f),
UIColor(0.0f, 1.0f, 0.0f, 1.0f),
UIColor(0.0f, 1.0f, 1.0f, 1.0f),
UIColor(0.0f, 0.0f, 1.0f, 1.0f),
UIColor(1.0f, 0.0f, 1.0f, 1.0f),
UIColor(1.0f, 0.0f, 0.0f, 1.0f)
};
for (int index = 0; index < 6; ++index) {
drawList.AddFilledRectLinearGradient(
UIRect(
layout.hueStripRect.x,
layout.hueStripRect.y + segmentHeight * static_cast<float>(index),
layout.hueStripRect.width,
segmentHeight + 1.0f),
hueStops[index],
hueStops[index + 1],
UILinearGradientDirection::Vertical,
0.0f);
}
drawList.AddRectOutline(layout.hueStripRect, UIColor(0.12f, 0.12f, 0.12f, 1.0f), 1.0f, 2.0f);
const float hueMarkerY = layout.hueStripRect.y + layout.hueStripRect.height * 0.44f;
drawList.AddLine(
UIPoint(layout.hueStripRect.x - 4.0f, hueMarkerY),
UIPoint(layout.hueStripRect.x + layout.hueStripRect.width + 4.0f, hueMarkerY),
UIColor(1.0f, 1.0f, 1.0f, 1.0f),
2.0f);
DrawCheckerboard(drawList, layout.alphaPreviewRect, 6.0f);
drawList.AddFilledRect(
UIRect(
layout.alphaPreviewRect.x,
layout.alphaPreviewRect.y,
layout.alphaPreviewRect.width,
layout.alphaPreviewRect.height),
UIColor(0.23f, 0.64f, 0.98f, 0.55f),
2.0f);
drawList.AddRectOutline(layout.alphaPreviewRect, UIColor(0.12f, 0.12f, 0.12f, 1.0f), 1.0f, 2.0f);
drawList.AddRectOutline(layout.closeButtonRect, UIColor(0.38f, 0.38f, 0.38f, 1.0f), 1.0f, 2.0f);
drawList.AddLine(
UIPoint(layout.closeButtonRect.x + 5.0f, layout.closeButtonRect.y + 5.0f),
UIPoint(layout.closeButtonRect.x + layout.closeButtonRect.width - 5.0f, layout.closeButtonRect.y + layout.closeButtonRect.height - 5.0f),
UIColor(0.92f, 0.92f, 0.92f, 1.0f),
1.5f);
drawList.AddLine(
UIPoint(layout.closeButtonRect.x + layout.closeButtonRect.width - 5.0f, layout.closeButtonRect.y + 5.0f),
UIPoint(layout.closeButtonRect.x + 5.0f, layout.closeButtonRect.y + layout.closeButtonRect.height - 5.0f),
UIColor(0.92f, 0.92f, 0.92f, 1.0f),
1.5f);
const bool framePresented = m_renderer.Render(drawData);
m_autoScreenshot.CaptureIfRequested(
m_renderer,
drawData,
static_cast<unsigned int>(width),
static_cast<unsigned int>(height),
framePresented);
}
HWND m_hwnd = nullptr;
ATOM m_windowClassAtom = 0;
NativeRenderer m_renderer = {};
AutoScreenshotController m_autoScreenshot = {};
std::filesystem::path m_captureRoot = {};
std::string m_lastStatus = "等待检查";
};
} // namespace
int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE, LPWSTR, int nCmdShow) {
return ScenarioApp().Run(hInstance, nCmdShow);
}

78
tests/UI/Core/integration/shared/src/NativeRenderer.cpp
View File

@@ -12,12 +12,57 @@ D2D1_RECT_F ToD2DRect(const ::XCEngine::UI::UIRect& rect) {
return D2D1::RectF(rect.x, rect.y, rect.x + rect.width, rect.y + rect.height);
}
D2D1_COLOR_F ToD2DColorValue(const ::XCEngine::UI::UIColor& color) {
return D2D1::ColorF(color.r, color.g, color.b, color.a);
}
std::string HrToString(const char* operation, HRESULT hr) {
char buffer[128] = {};
sprintf_s(buffer, "%s failed with hr=0x%08X.", operation, static_cast<unsigned int>(hr));
return buffer;
}
void FillLinearGradientRect(
ID2D1RenderTarget& renderTarget,
const ::XCEngine::UI::UIDrawCommand& command) {
const D2D1_RECT_F rect = ToD2DRect(command.rect);
const D2D1_GRADIENT_STOP stops[2] = {
D2D1::GradientStop(0.0f, ToD2DColorValue(command.color)),
D2D1::GradientStop(1.0f, ToD2DColorValue(command.secondaryColor))
};
Microsoft::WRL::ComPtr<ID2D1GradientStopCollection> stopCollection;
if (FAILED(renderTarget.CreateGradientStopCollection(
stops,
2u,
stopCollection.ReleaseAndGetAddressOf()))) {
return;
}
const D2D1_POINT_2F startPoint = D2D1::Point2F(rect.left, rect.top);
const D2D1_POINT_2F endPoint =
command.gradientDirection == ::XCEngine::UI::UILinearGradientDirection::Vertical
? D2D1::Point2F(rect.left, rect.bottom)
: D2D1::Point2F(rect.right, rect.top);
Microsoft::WRL::ComPtr<ID2D1LinearGradientBrush> gradientBrush;
if (FAILED(renderTarget.CreateLinearGradientBrush(
D2D1::LinearGradientBrushProperties(startPoint, endPoint),
stopCollection.Get(),
gradientBrush.ReleaseAndGetAddressOf()))) {
return;
}
if (command.rounding > 0.0f) {
renderTarget.FillRoundedRectangle(
D2D1::RoundedRect(rect, command.rounding, command.rounding),
gradientBrush.Get());
return;
}
renderTarget.FillRectangle(rect, gradientBrush.Get());
}
} // namespace
bool NativeRenderer::Initialize(HWND hwnd) {
@@ -345,6 +390,9 @@ void NativeRenderer::RenderCommand(
}
break;
}
case ::XCEngine::UI::UIDrawCommandType::FilledRectLinearGradient:
FillLinearGradientRect(renderTarget, command);
break;
case ::XCEngine::UI::UIDrawCommandType::RectOutline: {
const D2D1_RECT_F rect = ToD2DRect(command.rect);
const float thickness = command.thickness > 0.0f ? command.thickness : 1.0f;
@@ -358,6 +406,34 @@ void NativeRenderer::RenderCommand(
}
break;
}
case ::XCEngine::UI::UIDrawCommandType::Line:
renderTarget.DrawLine(
D2D1::Point2F(command.position.x, command.position.y),
D2D1::Point2F(command.uvMin.x, command.uvMin.y),
&solidBrush,
command.thickness > 0.0f ? command.thickness : 1.0f);
break;
case ::XCEngine::UI::UIDrawCommandType::FilledCircle:
if (command.radius > 0.0f) {
renderTarget.FillEllipse(
D2D1::Ellipse(
D2D1::Point2F(command.position.x, command.position.y),
command.radius,
command.radius),
&solidBrush);
}
break;
case ::XCEngine::UI::UIDrawCommandType::CircleOutline:
if (command.radius > 0.0f) {
renderTarget.DrawEllipse(
D2D1::Ellipse(
D2D1::Point2F(command.position.x, command.position.y),
command.radius,
command.radius),
&solidBrush,
command.thickness > 0.0f ? command.thickness : 1.0f);
}
break;
case ::XCEngine::UI::UIDrawCommandType::Text: {
if (command.text.empty()) {
break;
@@ -452,7 +528,7 @@ IDWriteTextFormat* NativeRenderer::GetTextFormat(float fontSize) {
}
D2D1_COLOR_F NativeRenderer::ToD2DColor(const ::XCEngine::UI::UIColor& color) {
return D2D1::ColorF(color.r, color.g, color.b, color.a);
return ToD2DColorValue(color);
}
std::wstring NativeRenderer::Utf8ToWide(std::string_view text) {

2
tests/UI/Core/unit/CMakeLists.txt
View File

@@ -3,12 +3,14 @@ set(CORE_UI_TEST_SOURCES
${CMAKE_SOURCE_DIR}/tests/UI/Core/unit/test_input_modifier_tracker.cpp
${CMAKE_SOURCE_DIR}/tests/UI/Core/unit/test_layout_engine.cpp
${CMAKE_SOURCE_DIR}/tests/UI/Core/unit/test_ui_core.cpp
${CMAKE_SOURCE_DIR}/tests/UI/Core/unit/test_ui_draw_data.cpp
${CMAKE_SOURCE_DIR}/tests/UI/Core/unit/test_ui_expansion_model.cpp
${CMAKE_SOURCE_DIR}/tests/UI/Core/unit/test_ui_flat_hierarchy_helpers.cpp
${CMAKE_SOURCE_DIR}/tests/UI/Core/unit/test_ui_input_dispatcher.cpp
${CMAKE_SOURCE_DIR}/tests/UI/Core/unit/test_ui_keyboard_navigation_model.cpp
${CMAKE_SOURCE_DIR}/tests/UI/Core/unit/test_ui_popup_overlay_model.cpp
${CMAKE_SOURCE_DIR}/tests/UI/Core/unit/test_ui_property_edit_model.cpp
${CMAKE_SOURCE_DIR}/tests/UI/Core/unit/test_ui_scroll_model.cpp
${CMAKE_SOURCE_DIR}/tests/UI/Core/unit/test_ui_selection_model.cpp
${CMAKE_SOURCE_DIR}/tests/UI/Core/unit/test_ui_style_system.cpp
${CMAKE_SOURCE_DIR}/tests/UI/Core/unit/test_ui_shortcut_scope.cpp

82
tests/UI/Core/unit/test_ui_draw_data.cpp Normal file
View File

@@ -0,0 +1,82 @@
#include <gtest/gtest.h>
#include <XCEngine/UI/DrawData.h>
namespace {
using XCEngine::UI::UIColor;
using XCEngine::UI::UIDrawCommandType;
using XCEngine::UI::UIDrawData;
using XCEngine::UI::UIDrawList;
using XCEngine::UI::UILinearGradientDirection;
using XCEngine::UI::UIPoint;
using XCEngine::UI::UIRect;
TEST(UIDrawDataTest, DrawListPreservesGradientLineAndCirclePayload) {
UIDrawList drawList("CorePrimitives");
drawList.AddFilledRectLinearGradient(
UIRect(10.0f, 20.0f, 140.0f, 24.0f),
UIColor(1.0f, 0.0f, 0.0f, 1.0f),
UIColor(0.0f, 0.0f, 1.0f, 1.0f),
UILinearGradientDirection::Vertical,
3.0f);
drawList.AddLine(
UIPoint(8.0f, 12.0f),
UIPoint(28.0f, 36.0f),
UIColor(0.9f, 0.9f, 0.9f, 1.0f),
2.0f);
drawList.AddFilledCircle(
UIPoint(48.0f, 52.0f),
6.0f,
UIColor(0.2f, 0.6f, 0.9f, 1.0f));
drawList.AddCircleOutline(
UIPoint(48.0f, 52.0f),
9.0f,
UIColor(1.0f, 1.0f, 1.0f, 1.0f),
1.5f);
ASSERT_EQ(drawList.GetCommandCount(), 4u);
const auto& commands = drawList.GetCommands();
EXPECT_EQ(commands[0].type, UIDrawCommandType::FilledRectLinearGradient);
EXPECT_FLOAT_EQ(commands[0].rect.width, 140.0f);
EXPECT_EQ(commands[0].gradientDirection, UILinearGradientDirection::Vertical);
EXPECT_FLOAT_EQ(commands[0].secondaryColor.b, 1.0f);
EXPECT_FLOAT_EQ(commands[0].rounding, 3.0f);
EXPECT_EQ(commands[1].type, UIDrawCommandType::Line);
EXPECT_FLOAT_EQ(commands[1].position.x, 8.0f);
EXPECT_FLOAT_EQ(commands[1].uvMin.x, 28.0f);
EXPECT_FLOAT_EQ(commands[1].thickness, 2.0f);
EXPECT_EQ(commands[2].type, UIDrawCommandType::FilledCircle);
EXPECT_FLOAT_EQ(commands[2].position.x, 48.0f);
EXPECT_FLOAT_EQ(commands[2].radius, 6.0f);
EXPECT_EQ(commands[3].type, UIDrawCommandType::CircleOutline);
EXPECT_FLOAT_EQ(commands[3].position.y, 52.0f);
EXPECT_FLOAT_EQ(commands[3].radius, 9.0f);
EXPECT_FLOAT_EQ(commands[3].thickness, 1.5f);
}
TEST(UIDrawDataTest, DrawDataAggregatesNewPrimitiveCommands) {
UIDrawData drawData = {};
auto& first = drawData.EmplaceDrawList("Gradients");
first.AddFilledRectLinearGradient(
UIRect(0.0f, 0.0f, 50.0f, 12.0f),
UIColor(0.0f, 0.0f, 0.0f, 1.0f),
UIColor(1.0f, 1.0f, 1.0f, 1.0f));
auto& second = drawData.EmplaceDrawList("Handles");
second.AddFilledCircle(UIPoint(12.0f, 12.0f), 4.0f, UIColor(1.0f, 0.0f, 0.0f, 1.0f));
second.AddCircleOutline(UIPoint(12.0f, 12.0f), 6.0f, UIColor(1.0f, 1.0f, 1.0f, 1.0f));
second.AddLine(
UIPoint(0.0f, 24.0f),
UIPoint(32.0f, 24.0f),
UIColor(0.7f, 0.7f, 0.7f, 1.0f));
EXPECT_EQ(drawData.GetDrawListCount(), 2u);
EXPECT_EQ(drawData.GetTotalCommandCount(), 4u);
}
} // namespace

53
tests/UI/Core/unit/test_ui_scroll_model.cpp Normal file
View File

@@ -0,0 +1,53 @@
#include <gtest/gtest.h>
#include <XCEngine/UI/Widgets/UIScrollModel.h>
namespace {
using XCEngine::UI::Widgets::ApplyUIScrollWheel;
using XCEngine::UI::Widgets::ClampUIScrollOffset;
using XCEngine::UI::Widgets::ComputeUIScrollOverflow;
using XCEngine::UI::Widgets::EnsureUIScrollOffsetVisible;
TEST(UIScrollModelTest, OverflowAndClampUseViewportBounds) {
EXPECT_FLOAT_EQ(ComputeUIScrollOverflow(80.0f, 120.0f), 0.0f);
EXPECT_FLOAT_EQ(ComputeUIScrollOverflow(240.0f, 120.0f), 120.0f);
EXPECT_FLOAT_EQ(ClampUIScrollOffset(-20.0f, 240.0f, 120.0f), 0.0f);
EXPECT_FLOAT_EQ(ClampUIScrollOffset(40.0f, 240.0f, 120.0f), 40.0f);
EXPECT_FLOAT_EQ(ClampUIScrollOffset(180.0f, 240.0f, 120.0f), 120.0f);
}
TEST(UIScrollModelTest, WheelMutationUsesDefaultStepAndReportsClampedNoops) {
const auto scrollDown = ApplyUIScrollWheel(48.0f, -120.0f, 360.0f, 120.0f);
EXPECT_TRUE(scrollDown.changed);
EXPECT_FLOAT_EQ(scrollDown.overflow, 240.0f);
EXPECT_FLOAT_EQ(scrollDown.offsetBefore, 48.0f);
EXPECT_FLOAT_EQ(scrollDown.offsetAfter, 96.0f);
const auto clamped = ApplyUIScrollWheel(0.0f, 120.0f, 360.0f, 120.0f);
EXPECT_FALSE(clamped.changed);
EXPECT_FLOAT_EQ(clamped.offsetBefore, 0.0f);
EXPECT_FLOAT_EQ(clamped.offsetAfter, 0.0f);
const auto noOverflow = ApplyUIScrollWheel(0.0f, -120.0f, 80.0f, 120.0f);
EXPECT_FALSE(noOverflow.changed);
EXPECT_FLOAT_EQ(noOverflow.overflow, 0.0f);
}
TEST(UIScrollModelTest, EnsureVisibleKeepsRowsInsideViewport) {
EXPECT_FLOAT_EQ(
EnsureUIScrollOffsetVisible(24.0f, 12.0f, 20.0f, 300.0f, 120.0f),
12.0f);
EXPECT_FLOAT_EQ(
EnsureUIScrollOffsetVisible(24.0f, 96.0f, 36.0f, 300.0f, 120.0f),
24.0f);
EXPECT_FLOAT_EQ(
EnsureUIScrollOffsetVisible(24.0f, 164.0f, 28.0f, 300.0f, 120.0f),
72.0f);
EXPECT_FLOAT_EQ(
EnsureUIScrollOffsetVisible(180.0f, 260.0f, 60.0f, 300.0f, 120.0f),
180.0f);
}
} // namespace