From 1f0c955539874a091fa3c47aa830c9fd0e2ff136 Mon Sep 17 00:00:00 2001 From: Linductor-alkaid <202200171251@mail.sdu.edu.cn> Date: Thu, 8 Oct 2026 21:46:35 +0800 Subject: [PATCH 1/3] fix(window): present prepared frames at the current drawable size --- core/app/glfw_app_main.cpp | 34 +++- core/app/main_window_runtime.h | 49 ++++-- core/app/sdl2_app_main.cpp | 34 +++- core/window/window_backend.cpp | 3 +- core/window/window_types.h | 2 + ...06\346\210\220\346\214\207\345\215\227.md" | 5 + tests/probes/frame_presentation_probe.cpp | 155 ++++++++++++++++++ 7 files changed, 265 insertions(+), 17 deletions(-) create mode 100644 tests/probes/frame_presentation_probe.cpp diff --git a/core/app/glfw_app_main.cpp b/core/app/glfw_app_main.cpp index e2346e51..931a0248 100644 --- a/core/app/glfw_app_main.cpp +++ b/core/app/glfw_app_main.cpp @@ -44,6 +44,7 @@ struct WindowState : app::AppRunner { struct ManagedWindow { GLFWwindow* window = nullptr; WindowState state; + bool shown = false; app::DslWindowRuntime content; std::unique_ptr renderBackend; }; @@ -86,6 +87,12 @@ float getPointerScale(GLFWwindow* window) { return (scaleX + scaleY) * 0.5f; } +app::MainWindowMetrics windowMetrics(GLFWwindow* window) { + int width = 0, height = 0; + glfwGetFramebufferSize(window, &width, &height); + return {width, height, getDpiScale(window), getPointerScale(window)}; +} + GLFWmonitor* getWindowMonitor(GLFWwindow* window) { if (GLFWmonitor* monitor = glfwGetWindowMonitor(window)) { return monitor; @@ -247,6 +254,7 @@ std::unique_ptr createManagedWindow(const app::DslWindowRequest& GLFWwindow* parentWindow, core::render::RenderBackend& shareBackend) { core::window::WindowCreateRequest windowRequest; + windowRequest.visible = false; windowRequest.width = request.width; windowRequest.height = request.height; windowRequest.title = request.title.c_str(); @@ -346,6 +354,14 @@ bool updateManagedWindow(ManagedWindow& managed, float deltaSeconds, bool update managed.state.paintRequested = true; } + const app::MainWindowMetrics metrics{framebufferWidth, framebufferHeight, dpiScale, pointerScale}; + if (!(metrics == windowMetrics(managed.window))) { + managed.state.paintRequested = true; + managed.content.requestFullPaint(); + core::platform::requestFrame(); + return true; + } + if (managed.state.paintRequested || managed.content.paintRequested()) { managed.renderBackend->beginFrame({ managed.window, @@ -355,6 +371,15 @@ bool updateManagedWindow(ManagedWindow& managed, float deltaSeconds, bool update dpiScale }); managed.content.render(*managed.renderBackend, framebufferWidth, framebufferHeight, dpiScale); + if (!managed.shown) { + glfwShowWindow(managed.window); + managed.shown = true; + managed.content.requestFullPaint(); + core::platform::requestFrame(); + if (managed.content.request().modal) { + glfwFocusWindow(managed.window); + } + } managed.renderBackend->present(); managed.state.paintRequested = false; ++managed.state.renderedFrames; @@ -412,6 +437,7 @@ int eui_app_run() { TimerResolutionGuard timerResolution; core::window::WindowCreateRequest windowRequest; + windowRequest.visible = false; windowRequest.width = app::initialWindowWidth(); windowRequest.height = app::initialWindowHeight(); windowRequest.x = app::initialWindowX(); @@ -467,7 +493,11 @@ int eui_app_run() { cleanupMainWindow(); return -1; } - app::MainWindowRuntime mainWindowRuntime(windowState); + app::MainWindowRuntime mainWindowRuntime(windowState, [&] { + glfwShowWindow(window); + app::detail::requestFullPaint(); + core::platform::requestFrame(); + }); windowState.initializeTray(); glfwSetWindowCloseCallback(window, [](GLFWwindow* currentWindow) { WindowState* state = static_cast(glfwGetWindowUserPointer(currentWindow)); @@ -559,7 +589,7 @@ int eui_app_run() { mainWindowRuntime.runFrame( window, *renderBackend, - {framebufferWidth, framebufferHeight, dpiScale, pointerScale}, + [&] { return windowMetrics(window); }, currentFrameTime, getWindowRefreshRate(window), mainInputEnabled, diff --git a/core/app/main_window_runtime.h b/core/app/main_window_runtime.h index 2868a255..0e9271d9 100644 --- a/core/app/main_window_runtime.h +++ b/core/app/main_window_runtime.h @@ -9,6 +9,7 @@ #include "core/window/window_backend.h" #include +#include #include #include @@ -20,6 +21,11 @@ struct MainWindowMetrics { float dpiScale = 1.0f; float pointerScale = 1.0f; + bool operator==(const MainWindowMetrics& other) const { + return framebufferWidth == other.framebufferWidth && framebufferHeight == other.framebufferHeight && + dpiScale == other.dpiScale && pointerScale == other.pointerScale; + } + bool valid() const { return framebufferWidth > 0 && framebufferHeight > 0 && dpiScale > 0.0f && pointerScale > 0.0f; } @@ -27,12 +33,13 @@ struct MainWindowMetrics { class MainWindowRuntime { public: - explicit MainWindowRuntime(AppRunner& runner) : runner_(runner) {} + explicit MainWindowRuntime(AppRunner& runner, std::function firstFrameReady = {}) + : runner_(runner), firstFrameReady_(std::move(firstFrameReady)) {} - template + template void runFrame(core::window::Handle window, core::render::RenderBackend& renderBackend, - const MainWindowMetrics& metrics, + ReadMetricsFn&& readMetrics, double now, double refreshRate, bool inputEnabled, @@ -48,7 +55,7 @@ class MainWindowRuntime { updateRequested || frameWakeRequested || runner_.anyAnimating(childAnimating()) || - core::hasPendingPointerInput(window, metrics.pointerScale); + core::hasPendingPointerInput(window, readMetrics().pointerScale); while (frameRequested) { const double remaining = runner_.nextFrameTime - core::window::timeSeconds(); if (remaining <= 0.0) { @@ -61,12 +68,13 @@ class MainWindowRuntime { const float deltaSeconds = runner_.consumeFrameDelta(frameTime); updateAndRender(window, - renderBackend, - metrics, - deltaSeconds, - updateRequested, - inputEnabled, - std::forward(afterUpdate)); + renderBackend, + readMetrics(), + deltaSeconds, + updateRequested, + inputEnabled, + std::forward(afterUpdate), + readMetrics); updateChildren(deltaSeconds, updateRequested); runner_.updateFrameTitle(core::window::timeSeconds(), std::forward(setTitle)); @@ -78,14 +86,15 @@ class MainWindowRuntime { runner_.resetTiming(now); } - template + template bool updateAndRender(core::window::Handle window, core::render::RenderBackend& renderBackend, const MainWindowMetrics& metrics, float deltaSeconds, bool updateRequested, bool inputEnabled, - AfterUpdateFn&& afterUpdate) { + AfterUpdateFn&& afterUpdate, + ReadMetricsFn&& readMetrics) { if (!metrics.valid()) { runner_.paintRequested = true; return false; @@ -106,6 +115,15 @@ class MainWindowRuntime { afterUpdate(); + // Input/compose callbacks may resize the native window. Do not swap an + // old-size cache into the new drawable; retry with fresh layout next frame. + if (!(metrics == readMetrics())) { + runner_.paintRequested = true; + app::detail::requestFullPaint(); + core::platform::requestFrame(); + return false; + } + if (!runner_.paintRequested) { return false; } @@ -119,6 +137,12 @@ class MainWindowRuntime { metrics.dpiScale }); app::render(metrics.framebufferWidth, metrics.framebufferHeight, metrics.dpiScale); + // Map only after drawing, immediately before swapping the prepared + // buffer. Swapping while hidden can discard its contents on X11. + if (firstFrameReady_) { + auto ready = std::move(firstFrameReady_); + ready(); + } renderBackend.present(); core::render::publishRenderFrameStats(); runner_.recordRenderStats(core::render::lastRenderFrameStats()); @@ -130,6 +154,7 @@ class MainWindowRuntime { private: AppRunner& runner_; + std::function firstFrameReady_; }; } // namespace app diff --git a/core/app/sdl2_app_main.cpp b/core/app/sdl2_app_main.cpp index a13bc059..0cd8e382 100644 --- a/core/app/sdl2_app_main.cpp +++ b/core/app/sdl2_app_main.cpp @@ -50,6 +50,7 @@ struct WindowState : app::AppRunner { struct ManagedWindow { SDL_Window* window = nullptr; bool closeRequested = false; + bool shown = false; SDL_Window* parentWindow = nullptr; app::DslWindowRuntime content; std::unique_ptr renderBackend; @@ -129,6 +130,12 @@ float dpiScale(SDL_Window* window) { return x11Scale > 0.0f ? x11Scale : drawableRatio; } +app::MainWindowMetrics windowMetrics(SDL_Window* window) { + int width = 0, height = 0; + getDrawableSize(window, width, height); + return {width, height, dpiScale(window), pointerScale(window)}; +} + void attachNativeChildWindow(SDL_Window* parentWindow, SDL_Window* childWindow) { eui_set_native_child_window(core::window::nativeWindowInfo(parentWindow).platformWindow, core::window::nativeWindowInfo(childWindow).platformWindow, @@ -436,6 +443,7 @@ std::unique_ptr createManagedWindow(const app::DslWindowRequest& SDL_Window* parentWindow, core::render::RenderBackend& shareBackend) { core::window::WindowCreateRequest windowRequest; + windowRequest.visible = false; windowRequest.width = request.width; windowRequest.height = request.height; windowRequest.title = request.title.c_str(); @@ -568,6 +576,13 @@ bool updateManagedWindow(ManagedWindow& managed, float deltaSeconds, bool update core::render::ScopedRenderBackend scopedRenderBackend(*managed.renderBackend); managed.content.update(managed.window, deltaSeconds, logicalWidth, logicalHeight, pointer, dpi, updateRequested); + const app::MainWindowMetrics metrics{drawableWidth, drawableHeight, dpi, pointer}; + if (!(metrics == windowMetrics(managed.window))) { + managed.content.requestFullPaint(); + core::platform::requestFrame(); + return true; + } + if (managed.content.paintRequested()) { managed.renderBackend->beginFrame({ managed.window, @@ -577,6 +592,15 @@ bool updateManagedWindow(ManagedWindow& managed, float deltaSeconds, bool update dpi }); managed.content.render(*managed.renderBackend, drawableWidth, drawableHeight, dpi); + if (!managed.shown) { + SDL_ShowWindow(managed.window); + managed.shown = true; + managed.content.requestFullPaint(); + core::platform::requestFrame(); + if (managed.content.request().modal) { + SDL_RaiseWindow(managed.window); + } + } managed.renderBackend->present(); } return true; @@ -601,6 +625,7 @@ int eui_app_run() { TimerResolutionGuard timerResolution; core::window::WindowCreateRequest windowRequest; + windowRequest.visible = false; windowRequest.width = app::initialWindowWidth(); windowRequest.height = app::initialWindowHeight(); windowRequest.x = app::initialWindowX(); @@ -650,7 +675,11 @@ int eui_app_run() { updateFrameInterval(window, state); state.initializeTray(); state.renderBackend = renderBackend.get(); - app::MainWindowRuntime mainWindowRuntime(state); + app::MainWindowRuntime mainWindowRuntime(state, [&] { + SDL_ShowWindow(window); + app::detail::requestFullPaint(); + core::platform::requestFrame(); + }); app::DslWindowManager childWindows; while (state.running) { @@ -740,7 +769,7 @@ int eui_app_run() { mainWindowRuntime.runFrame( window, *renderBackend, - {drawableWidth, drawableHeight, dpi, pointer}, + [&] { return windowMetrics(window); }, now, refreshRate(window), findModalWindow(childWindows) == nullptr, @@ -759,6 +788,7 @@ int eui_app_run() { [&] { return childWindows.anyAnimating(); }); + } childWindows.destroyAll(destroyManagedWindow); diff --git a/core/window/window_backend.cpp b/core/window/window_backend.cpp index e1851d9a..1f7d90a4 100644 --- a/core/window/window_backend.cpp +++ b/core/window/window_backend.cpp @@ -339,7 +339,7 @@ Handle createWindow(const WindowCreateRequest& request) { configureOpenGLWindowAttributes(); } - Uint32 flags = 0; + Uint32 flags = request.visible ? 0 : SDL_WINDOW_HIDDEN; if (request.highDpi) { flags |= SDL_WINDOW_ALLOW_HIGHDPI; } @@ -574,6 +574,7 @@ Handle createWindow(const WindowCreateRequest& request) { configureOpenGLWindowHints(); shareContext = static_cast(request.parent); } + glfwWindowHint(GLFW_VISIBLE, request.visible ? GLFW_TRUE : GLFW_FALSE); glfwWindowHint(GLFW_RESIZABLE, request.resizable ? GLFW_TRUE : GLFW_FALSE); glfwWindowHint(GLFW_DECORATED, request.decorated ? GLFW_TRUE : GLFW_FALSE); glfwWindowHint(GLFW_FLOATING, request.alwaysOnTop ? GLFW_TRUE : GLFW_FALSE); diff --git a/core/window/window_types.h b/core/window/window_types.h index 764c5fa8..bade2d4b 100644 --- a/core/window/window_types.h +++ b/core/window/window_types.h @@ -30,6 +30,8 @@ struct WindowCreateRequest { int maxHeight = 0; const char* title = ""; std::string appId; + // App runners defer visibility until their first valid frame is ready. + bool visible = true; bool resizable = true; bool highDpi = true; bool decorated = true; diff --git "a/docs/\351\233\206\346\210\220\346\214\207\345\215\227.md" "b/docs/\351\233\206\346\210\220\346\214\207\345\215\227.md" index 8cb36137..819377ce 100644 --- "a/docs/\351\233\206\346\210\220\346\214\207\345\215\227.md" +++ "b/docs/\351\233\206\346\210\220\346\214\207\345\215\227.md" @@ -9,6 +9,11 @@ main.cpp EUI-NEO 会通过 `eui_neo_configure_app()` 自动加入窗口入口、输入处理、渲染后端、平台链接选项和运行资源;应用不需要引用 `core/`,也不需要自行编写窗口主循环。 +应用主窗口和 DSL 子窗口在首次有效内容绘制完成后、紧接首次提交之前显示,`onStart` 执行时窗口仍隐藏。 +请让入口管理初次显示,避免在 `onStart` 或首次 `compose` 中直接调用原生显示窗口接口。 +输入或 `compose` 回调改变窗口尺寸时,入口会保留重绘请求,在下一次更新中按新尺寸布局, +不会把旧尺寸帧提交到新 drawable。显示后立即提交已准备的帧,并请求完整重绘以处理映射可能造成的缓冲失效。 + ## 选择接入方式 | 方式 | 适合场景 | EUI-NEO 来源 | diff --git a/tests/probes/frame_presentation_probe.cpp b/tests/probes/frame_presentation_probe.cpp new file mode 100644 index 00000000..30b2be72 --- /dev/null +++ b/tests/probes/frame_presentation_probe.cpp @@ -0,0 +1,155 @@ +#include "core/app/main_window_runtime.h" +#include "eui/detail/dsl_app_impl.h" +#include "eui_neo.h" +#if defined(EUI_WINDOW_BACKEND_SDL2) +#define SDL_MAIN_HANDLED +#include +#if defined(EUI_RENDER_BACKEND_VULKAN) +#include +#endif +#else +#define GLFW_INCLUDE_NONE +#include +#endif +#include + +namespace { +int failures = 0; +void require(bool condition, const char* message) { + if (!condition) { + std::fprintf(stderr, "frame_presentation_probe: %s\n", message); + ++failures; + } +} +void resize(core::window::Handle window, int w, int h) { +#if defined(EUI_WINDOW_BACKEND_SDL2) + SDL_SetWindowSize(static_cast(window), w, h); +#else + glfwSetWindowSize(static_cast(window), w, h); +#endif +} +app::MainWindowMetrics metrics(core::window::Handle window) { + int w = 0, h = 0; +#if defined(EUI_WINDOW_BACKEND_SDL2) +#if defined(EUI_RENDER_BACKEND_VULKAN) + SDL_Vulkan_GetDrawableSize(static_cast(window), &w, &h); +#else + SDL_GL_GetDrawableSize(static_cast(window), &w, &h); +#endif +#else + glfwGetFramebufferSize(static_cast(window), &w, &h); +#endif + return {w, h, 1, 1}; +} +} // namespace +namespace app { +const DslAppConfig& dslAppConfig() { + static const auto config = DslAppConfig{}.iconPath("").tray(false).clearColor({0.8f, 0.6f, 0.4f, 1}); + return config; +} +void compose(eui::Ui& ui, const eui::Screen& screen) { + ui.rect("fill").size(screen.width, screen.height).color({0.8f, 0.6f, 0.4f, 1}).build(); +} +} // namespace app +int main() { + core::render::initializeRenderBackendLoader(); +#if defined(EUI_WINDOW_BACKEND_SDL2) + SDL_SetMainReady(); + if (SDL_Init(SDL_INIT_VIDEO) != 0) + return 1; +#else + if (!glfwInit()) + return 1; +#endif + core::window::WindowCreateRequest request; + request.visible = false; + request.width = 320; + request.height = 240; + request.renderApi = core::render::windowRenderApi(); + auto window = core::window::createWindow(request); +#if defined(EUI_WINDOW_BACKEND_SDL2) + require(window && !(SDL_GetWindowFlags(static_cast(window)) & SDL_WINDOW_SHOWN), + "hidden creation exposed window"); +#else + require(window && !glfwGetWindowAttrib(static_cast(window), GLFW_VISIBLE), + "hidden creation exposed window"); +#endif + auto backend = core::render::createRenderBackend(window); + if (!window || !backend || !backend->initialize()) + return 1; + backend->makeCurrent(); + core::render::ScopedRenderBackend scope(*backend); + if (!app::initialize(window)) + return 1; + app::AppRunner runner; + int readyCalls = 0; + app::MainWindowRuntime runtime(runner, [&] { + ++readyCalls; + require(core::render::currentRenderFrameStats().framebufferWidth == metrics(window).framebufferWidth, + "window mapped before a frame at its current size was drawn"); + require(core::render::currentRenderFrameStats().backendPresents == 0, + "first frame was swapped before mapping"); +#if defined(EUI_WINDOW_BACKEND_SDL2) + require(!(SDL_GetWindowFlags(static_cast(window)) & SDL_WINDOW_SHOWN), + "window mapped before first frame readiness"); + SDL_ShowWindow(static_cast(window)); +#else + require(!glfwGetWindowAttrib(static_cast(window), GLFW_VISIBLE), + "window mapped before first frame readiness"); + glfwShowWindow(static_cast(window)); +#endif + }); + const auto original = metrics(window); + const bool stalePresented = runtime.updateAndRender( + window, *backend, original, 0, false, true, [&] { resize(window, 480, 360); }, + [&] { return metrics(window); }); + require(readyCalls == 0, "resize exposed an obsolete initial frame"); + require(!stalePresented, "presented old-size frame after resize during update"); + require(runner.paintRequested, "resize lost pending repaint"); + runner.paintRequested = true; + require(runtime.updateAndRender( + window, *backend, metrics(window), 0, false, true, [] {}, [&] { return metrics(window); }), + "fresh-size frame was not presented"); + require(core::render::lastRenderFrameStats().framebufferWidth == metrics(window).framebufferWidth, + "presented size differs from drawable"); + const auto presents = core::render::lastRenderFrameStats().backendPresents; + const auto frames = runner.renderedFrames; + const auto verifyDeferred = [&](app::MainWindowMetrics changed, const char* message) { + runner.paintRequested = true; + const auto current = metrics(window); + require(!runtime.updateAndRender( + window, *backend, current, 0, false, true, [] {}, [&] { return changed; }), + message); + require(runner.paintRequested && runner.renderedFrames == frames, + "deferred frame cleared repaint or counted a present"); + require(core::render::lastRenderFrameStats().backendPresents == presents, + "deferred frame changed present statistics"); + }; + auto changed = metrics(window); + changed.dpiScale = 2; + verifyDeferred(changed, "DPI change presented stale layout"); + changed = metrics(window); + changed.pointerScale = 2; + verifyDeferred(changed, "pointer scale change presented stale layout"); + verifyDeferred({0, 0, 1, 1}, "zero drawable after update was presented"); + require(!runtime.updateAndRender( + window, *backend, {0, 0, 1, 1}, 0, false, true, [] {}, [&] { return metrics(window); }), + "zero drawable before update was presented"); + require(runtime.updateAndRender( + window, *backend, metrics(window), 0, false, true, [] {}, [&] { return metrics(window); }), + "valid drawable did not recover after unavailable frame"); + runner.paintRequested = false; + require(!runtime.updateAndRender( + window, *backend, metrics(window), 0, false, true, [] {}, [&] { return metrics(window); }), + "unchanged idle frame was unnecessarily presented"); + require(readyCalls == 1, "first-frame readiness callback did not run exactly once"); + app::shutdown(); + backend.reset(); + core::window::destroyWindow(window); +#if defined(EUI_WINDOW_BACKEND_SDL2) + SDL_Quit(); +#else + glfwTerminate(); +#endif + return failures ? 1 : 0; +} From ef8661c739c96459aadc0b37393542deb4f48439 Mon Sep 17 00:00:00 2001 From: Linductor-alkaid <202200171251@mail.sdu.edu.cn> Date: Thu, 8 Oct 2026 21:49:20 +0800 Subject: [PATCH 2/3] fix(window): retry layout once after an update-time resize --- core/app/glfw_app_main.cpp | 2 -- core/app/main_window_runtime.h | 28 +++++++++++++------ core/app/sdl2_app_main.cpp | 2 -- ...06\346\210\220\346\214\207\345\215\227.md" | 2 +- tests/probes/frame_presentation_probe.cpp | 11 +++++--- 5 files changed, 27 insertions(+), 18 deletions(-) diff --git a/core/app/glfw_app_main.cpp b/core/app/glfw_app_main.cpp index 931a0248..a93e3777 100644 --- a/core/app/glfw_app_main.cpp +++ b/core/app/glfw_app_main.cpp @@ -582,8 +582,6 @@ int eui_app_run() { continue; } - const float dpiScale = getDpiScale(window); - const float pointerScale = getPointerScale(window); const bool mainInputEnabled = windowState.modalChildWindow == nullptr; mainWindowRuntime.runFrame( diff --git a/core/app/main_window_runtime.h b/core/app/main_window_runtime.h index 0e9271d9..aecb3819 100644 --- a/core/app/main_window_runtime.h +++ b/core/app/main_window_runtime.h @@ -115,13 +115,23 @@ class MainWindowRuntime { afterUpdate(); - // Input/compose callbacks may resize the native window. Do not swap an - // old-size cache into the new drawable; retry with fresh layout next frame. - if (!(metrics == readMetrics())) { + // Input/compose callbacks may resize the drawable. Recompose once with + // fresh metrics and zero elapsed time; consumed input is not replayed. + MainWindowMetrics renderMetrics = readMetrics(); + if (!(metrics == renderMetrics)) { runner_.paintRequested = true; app::detail::requestFullPaint(); - core::platform::requestFrame(); - return false; + if (renderMetrics.valid()) { + renderBackend.makeCurrent(); + app::update(window, 0.0f, renderMetrics.framebufferWidth, renderMetrics.framebufferHeight, + renderMetrics.dpiScale, renderMetrics.pointerScale, false, inputEnabled); + } + // A second geometry change is deferred rather than spinning inside + // one frame. Keep both the repaint and an explicit wake for idle apps. + if (!renderMetrics.valid() || !(renderMetrics == readMetrics())) { + core::platform::requestFrame(); + return false; + } } if (!runner_.paintRequested) { @@ -132,11 +142,11 @@ class MainWindowRuntime { renderBackend.beginFrame({ window, core::window::nativeWindowInfo(window), - metrics.framebufferWidth, - metrics.framebufferHeight, - metrics.dpiScale + renderMetrics.framebufferWidth, + renderMetrics.framebufferHeight, + renderMetrics.dpiScale }); - app::render(metrics.framebufferWidth, metrics.framebufferHeight, metrics.dpiScale); + app::render(renderMetrics.framebufferWidth, renderMetrics.framebufferHeight, renderMetrics.dpiScale); // Map only after drawing, immediately before swapping the prepared // buffer. Swapping while hidden can discard its contents on X11. if (firstFrameReady_) { diff --git a/core/app/sdl2_app_main.cpp b/core/app/sdl2_app_main.cpp index 0cd8e382..7d15918d 100644 --- a/core/app/sdl2_app_main.cpp +++ b/core/app/sdl2_app_main.cpp @@ -757,8 +757,6 @@ int eui_app_run() { mainWindowRuntime.markUnavailableFrame(core::window::timeSeconds()); continue; } - const float dpi = dpiScale(window); - const float pointer = pointerScale(window); #if defined(EUI_RENDER_BACKEND_OPENGL) && (defined(_WIN32) || defined(__APPLE__)) if (state.startupFullPaintFrames > 0) { state.paintRequested = true; diff --git "a/docs/\351\233\206\346\210\220\346\214\207\345\215\227.md" "b/docs/\351\233\206\346\210\220\346\214\207\345\215\227.md" index 819377ce..0cdc1431 100644 --- "a/docs/\351\233\206\346\210\220\346\214\207\345\215\227.md" +++ "b/docs/\351\233\206\346\210\220\346\214\207\345\215\227.md" @@ -11,7 +11,7 @@ EUI-NEO 会通过 `eui_neo_configure_app()` 自动加入窗口入口、输入处 应用主窗口和 DSL 子窗口在首次有效内容绘制完成后、紧接首次提交之前显示,`onStart` 执行时窗口仍隐藏。 请让入口管理初次显示,避免在 `onStart` 或首次 `compose` 中直接调用原生显示窗口接口。 -输入或 `compose` 回调改变窗口尺寸时,入口会保留重绘请求,在下一次更新中按新尺寸布局, +输入或 `compose` 回调改变窗口尺寸时,入口会按新尺寸进行一次零时间更新后再绘制;若尺寸再次变化,则保留重绘请求并唤醒下一帧, 不会把旧尺寸帧提交到新 drawable。显示后立即提交已准备的帧,并请求完整重绘以处理映射可能造成的缓冲失效。 ## 选择接入方式 diff --git a/tests/probes/frame_presentation_probe.cpp b/tests/probes/frame_presentation_probe.cpp index 30b2be72..d487c13b 100644 --- a/tests/probes/frame_presentation_probe.cpp +++ b/tests/probes/frame_presentation_probe.cpp @@ -103,9 +103,10 @@ int main() { const bool stalePresented = runtime.updateAndRender( window, *backend, original, 0, false, true, [&] { resize(window, 480, 360); }, [&] { return metrics(window); }); - require(readyCalls == 0, "resize exposed an obsolete initial frame"); - require(!stalePresented, "presented old-size frame after resize during update"); - require(runner.paintRequested, "resize lost pending repaint"); + require(stalePresented, "update-time resize did not produce a fresh-size frame"); + require(readyCalls == 1, "initial fresh-size frame was not made ready"); + require(core::render::lastRenderFrameStats().framebufferWidth == metrics(window).framebufferWidth, + "presented old-size frame after resize during update"); runner.paintRequested = true; require(runtime.updateAndRender( window, *backend, metrics(window), 0, false, true, [] {}, [&] { return metrics(window); }), @@ -117,8 +118,10 @@ int main() { const auto verifyDeferred = [&](app::MainWindowMetrics changed, const char* message) { runner.paintRequested = true; const auto current = metrics(window); + int reads = 0; require(!runtime.updateAndRender( - window, *backend, current, 0, false, true, [] {}, [&] { return changed; }), + window, *backend, current, 0, false, true, [] {}, + [&] { return ++reads == 1 ? changed : current; }), message); require(runner.paintRequested && runner.renderedFrames == frames, "deferred frame cleared repaint or counted a present"); From 88181290b480f2a4f15d1dfd0c79cbd78c68a4d6 Mon Sep 17 00:00:00 2001 From: Linductor-alkaid <202200171251@mail.sdu.edu.cn> Date: Thu, 8 Oct 2026 22:20:01 +0800 Subject: [PATCH 3/3] style(window): align frame update arguments --- core/app/main_window_runtime.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/core/app/main_window_runtime.h b/core/app/main_window_runtime.h index aecb3819..3db56ae5 100644 --- a/core/app/main_window_runtime.h +++ b/core/app/main_window_runtime.h @@ -68,13 +68,13 @@ class MainWindowRuntime { const float deltaSeconds = runner_.consumeFrameDelta(frameTime); updateAndRender(window, - renderBackend, - readMetrics(), - deltaSeconds, - updateRequested, - inputEnabled, - std::forward(afterUpdate), - readMetrics); + renderBackend, + readMetrics(), + deltaSeconds, + updateRequested, + inputEnabled, + std::forward(afterUpdate), + readMetrics); updateChildren(deltaSeconds, updateRequested); runner_.updateFrameTitle(core::window::timeSeconds(), std::forward(setTitle));