diff --git a/docs/modernization/debt.md b/docs/modernization/debt.md index 5b9c288..0098943 100644 --- a/docs/modernization/debt.md +++ b/docs/modernization/debt.md @@ -503,6 +503,11 @@ agent or engineer to remove them without reconstructing context from chat. `src/legacy_ui_overlay_services.*` instead of open-coded `mouse_release()` and `destroy()` pairs. Raw callback captures, retained popup close policy, and broader `Node` handle adoption remain open. +- 2026-06-12: DEBT-0063 was narrowed again. Top-toolbar, quick-panel, and + stroke-panel popup tick-decoration close callbacks now bind through + `src/legacy_ui_overlay_services.*` instead of per-panel lambdas. Other raw + popup callbacks, retained close policy, and broader `Node` handle adoption + remain open. - 2026-06-05: DEBT-0011 was narrowed. The Windows app package smoke target now passes the configure-time CMake executable into `package-smoke.ps1`, so VS 2026 generator validation does not depend on an older `cmake` on PATH, and @@ -769,7 +774,7 @@ agent or engineer to remove them without reconstructing context from chat. | DEBT-0060 | Open | Modernization | Retained Android package CMake generates a patched `nanort.h` overlay in the build tree for `native-lib` instead of modifying the `libs/nanort` submodule | Current SDK Manager NDK/Clang rejects `TriangleSAHPred::operator=` assigning to a `const size_t` member, but the retained grid/lightmap path still includes `nanort` before that dependency is replaced or updated | `powershell -ExecutionPolicy Bypass -File scripts\automation\android-legacy-package-build.ps1 -Packages standard`; Quest/Focus retained package configure checks; Windows app build | Update/replace `nanort`, move grid/lightmap baking behind a component that owns its dependency, or retire the retained Android package CMake path so no generated vendor overlay is required | | DEBT-0061 | Open | Modernization | Desktop XR runtime selection now lives in tested `pp_platform_api` policy and prefers OpenXR, but `WindowsPlatformServices` still reports OpenXR unavailable and reaches the retained OpenVR SDK bridge as a legacy fallback; Windows runtime deployment copies `openvr_api.dll` beside `PanoPainter.exe` until that fallback is removed | Preserve current desktop VR behavior while replacing OpenVR with OpenXR behind the platform/renderer boundary | `pp_platform_api_tests`; `ctest --preset desktop-fast --build-config Debug -R pp_platform_api_tests --output-on-failure`; `cmake --build --preset windows-msvc-default --config Debug --target PanoPainter` | Add an OpenXR SDK/package target, implement desktop OpenXR startup/shutdown/pose/controller submission behind `pp_platform_vr` or `PlatformServices`, validate parity with mocked/runtime smoke coverage, and remove `libs/openvr` plus the OpenVR link/include paths from root CMake | | DEBT-0062 | Open | Modernization | VS 2026 builds generate a patched fmt `format.h` overlay in the build tree for `pp_legacy_vendor`, disabling the old `_SECURE_SCL` checked-array iterator branch while leaving the fmt submodule clean | VS 2026's STL no longer exposes the legacy checked-array iterator used by this old fmt release, but replacing fmt is part of the dependency migration rather than this platform unblock | `cmake --build --preset windows-msvc-default --config Debug --target PanoPainter`; `cmake --build --preset windows-msvc-default --config Debug --target pp_platform_api_tests`; `ctest --preset desktop-fast --build-config Debug -R pp_platform_api_tests --output-on-failure` | Move fmt to a supported vcpkg/package version or update the vendored fmt release, then remove the generated fmt overlay from `pp_legacy_vendor` | -| DEBT-0063 | Open | Modernization | The retained UI tree still exposes `Node* m_parent`, public `std::vector> m_children`, raw `find()` lookup results, `add_child()` allocation through `new`, callbacks/observers that take or capture raw `Node*`, and manual `destroy()`/`m_destroyed` semantics. `pp_ui_core` now owns a tested `NodeLifetimeTree` target model with checked node handles, scoped callback connections, subtree destruction, pointer/keyboard capture release, whole-tree clear for layout reload, and mutation-safe dispatch, plus a tested `UiOverlayLifetime` popup/dialog stack model. Retained app-dialog root insertion, app-menu popup template cloning/root attachment, quick/stroke/brush panel popup root attachment, combo-box popup insertion, Open/Browse delete-confirmation dialog insertion, popup tick decoration insertion, top-toolbar panel popup insertion, repeated retained popup activation flag setup, and repeated retained popup close/release execution are now centralized in `src/legacy_ui_overlay_services.*`, but retained `Node`/`NodePopupMenu`/`NodeDialog*` still have not adopted checked handles or scoped callback ownership | Preserve current UI behavior while making panel/dialog extraction safe instead of spreading lifetime hazards into the new architecture | `pp_ui_core_layout_xml_tests`; `pp_ui_core_node_lifetime_tests`; `pp_ui_core_overlay_lifetime_tests`; future `pp_panopainter_ui_dialog_lifetime_tests`; `ctest --preset desktop-fast --build-config Debug`; `cmake --build --preset windows-msvc-default --config Debug --target PanoPainter` | Retained `Node` and `pp_panopainter_ui` adopt checked node handles or equivalent non-owning references, scoped callback connection/disconnect semantics, mutation-safe event dispatch, parent/child invariants hidden behind APIs, and destroy-during-callback/capture-release/popup-close/layout-reload tests; retained `Node*` APIs are removed or isolated behind compatibility adapters | +| DEBT-0063 | Open | Modernization | The retained UI tree still exposes `Node* m_parent`, public `std::vector> m_children`, raw `find()` lookup results, `add_child()` allocation through `new`, callbacks/observers that take or capture raw `Node*`, and manual `destroy()`/`m_destroyed` semantics. `pp_ui_core` now owns a tested `NodeLifetimeTree` target model with checked node handles, scoped callback connections, subtree destruction, pointer/keyboard capture release, whole-tree clear for layout reload, and mutation-safe dispatch, plus a tested `UiOverlayLifetime` popup/dialog stack model. Retained app-dialog root insertion, app-menu popup template cloning/root attachment, quick/stroke/brush panel popup root attachment, combo-box popup insertion, Open/Browse delete-confirmation dialog insertion, popup tick decoration insertion, top-toolbar panel popup insertion, repeated retained popup activation flag setup, repeated retained popup close/release execution, and popup tick-decoration close callback wiring are now centralized in `src/legacy_ui_overlay_services.*`, but retained `Node`/`NodePopupMenu`/`NodeDialog*` still have not adopted checked handles or scoped callback ownership | Preserve current UI behavior while making panel/dialog extraction safe instead of spreading lifetime hazards into the new architecture | `pp_ui_core_layout_xml_tests`; `pp_ui_core_node_lifetime_tests`; `pp_ui_core_overlay_lifetime_tests`; future `pp_panopainter_ui_dialog_lifetime_tests`; `ctest --preset desktop-fast --build-config Debug`; `cmake --build --preset windows-msvc-default --config Debug --target PanoPainter` | Retained `Node` and `pp_panopainter_ui` adopt checked node handles or equivalent non-owning references, scoped callback connection/disconnect semantics, mutation-safe event dispatch, parent/child invariants hidden behind APIs, and destroy-during-callback/capture-release/popup-close/layout-reload tests; retained `Node*` APIs are removed or isolated behind compatibility adapters | | DEBT-0057 | Open | Modernization | Default canvas allocation size now dispatches through `PlatformServices::default_canvas_resolution`, removing the `CANVAS_RES` platform macro from `src/canvas.h`; WebGL's retained 512 default now lives in tested `pp_platform_api::platform_policy`, but the Web shell still reaches it through the legacy platform fallback until injected Web services own the policy | Preserve WebGL memory behavior while moving canvas creation policy out of shared canvas headers and into the platform boundary | `pp_platform_api_tests`; `ctest --preset desktop-fast --build-config Debug -R pp_platform_api_tests`; Windows app build; WebGL package smoke once root Web build exists | Default canvas resolution is owned by injected `pp_platform_*` services for every supported platform, with no WebGL branch in the legacy fallback | | DEBT-0058 | Open | Modernization | App-level progress/message/input dialog metadata, including message-dialog OK/cancel captions, now consumes pure `pp_app_core` through `App::show_progress`, `App::message_box`, `App::input_box`, `pano_cli plan-app-dialog`, and `pp_app_core_app_dialog_tests`; live execution is centralized in `src/legacy_app_dialog_services.*`, and retained root insertion now routes through `src/legacy_ui_overlay_services.*`, but the bridge still creates retained `NodeProgressBar`, `NodeMessageBox`, and `NodeInputBox` instances with raw callback/lifetime ownership | Preserve current app-shell dialog behavior while moving shared dialog policy toward UI/app services | `pp_app_core_app_dialog_tests`; `pano_cli plan-app-dialog --kind progress --total -4`; `pano_cli plan-app-dialog --kind message --cancel`; `pano_cli plan-app-dialog --kind input --ok-caption Save`; `ctest --preset desktop-fast --build-config Debug`; Windows app build | Progress/message/input dialog creation, callback wiring, layout insertion, lifetime ownership, and headless automation are owned by injected app/UI services with `App` methods acting only as adapters | | DEBT-0059 | Open | Modernization | iOS root CMake headless builds assign generated bundle identifiers and disable code signing for executable test/tool targets | The current Apple gate is compile validation for shared component targets; signed iOS app/package validation is not migrated to root CMake yet | `powershell -ExecutionPolicy Bypass -File scripts\automation\apple-remote-build.ps1 -Presets macos,ios-simulator,ios-device`; `sh scripts/automation/platform-build.sh "ios-device"` on `panopainter-mac` | Root CMake owns the signed Apple app/package targets, package-smoke validates Apple bundles where signing material is available, and headless iOS test/tool targets are either excluded from signed package builds or use explicit test-runner signing policy | diff --git a/docs/modernization/roadmap.md b/docs/modernization/roadmap.md index 7fe56ed..843a30c 100644 --- a/docs/modernization/roadmap.md +++ b/docs/modernization/roadmap.md @@ -491,8 +491,10 @@ Open/Browse delete-confirmation dialogs, popup tick decoration nodes, and top-toolbar panel popups route through it. The helper also centralizes retained popup mouse-ignore/flood/capture-child activation for those popup families. Repeated menu, submenu, combo-box, and brush-preset popup close/release -execution now uses the same retained helper. Raw popup callback captures and -full close/capture ownership remain part of `DEBT-0063`. +execution now uses the same retained helper, and popup tick-decoration close +callbacks are bound through the overlay service instead of per-panel lambdas. +Raw popup callback captures and full close/capture ownership remain part of +`DEBT-0063`. `pano_cli inspect-image` exposes PNG IHDR metadata as JSON, `pano_cli import-image` accepts a PNG path and imports decoded RGBA8 pixels into a new pure `pp_document` face payload, diff --git a/src/app_layout.cpp b/src/app_layout.cpp index 5a029b8..ee7eb8a 100644 --- a/src/app_layout.cpp +++ b/src/app_layout.cpp @@ -490,9 +490,7 @@ void App::init_sidebar() auto scroll = stroke->find("scroller"); //scroll->SetHeight(glm::max(100.f, screen.y - pos.y - 200.f)); - stroke->on_popup_close = [this, tick](Node*) { - tick->destroy(); - }; + pp::panopainter::bind_legacy_popup_close_destroys_overlay(*stroke, tick); }; } //if (auto* button = layout[main_id]->find("btn-brush")) @@ -531,9 +529,7 @@ void App::init_sidebar() color->SetPositioning(YGPositionTypeAbsolute); pp::panopainter::activate_legacy_popup_overlay(*color); - color->on_popup_close = [this, tick](Node*) { - tick->destroy(); - }; + pp::panopainter::bind_legacy_popup_close_destroys_overlay(*color, tick); }; } if (auto* button = layout[main_id]->find("btn-layer")) @@ -566,9 +562,7 @@ void App::init_sidebar() auto scroll = layers->find("layers-container"); scroll->SetMaxHeight(glm::max(100.f, screen.y - pos.y - 200.f)); - layers->on_popup_close = [this, tick](Node*) { - tick->destroy(); - }; + pp::panopainter::bind_legacy_popup_close_destroys_overlay(*layers, tick); }; } if (auto* button = layout[main_id]->find("btn-grids-panel")) @@ -601,9 +595,7 @@ void App::init_sidebar() auto scroll = grid->find("scroller"); scroll->SetMaxHeight(glm::max(100.f, screen.y - pos.y - 250.f)); - grid->on_popup_close = [this, tick](Node*) { - tick->destroy(); - }; + pp::panopainter::bind_legacy_popup_close_destroys_overlay(*grid, tick); }; } } diff --git a/src/legacy_quick_ui_services.cpp b/src/legacy_quick_ui_services.cpp index f0791b5..c95c997 100644 --- a/src/legacy_quick_ui_services.cpp +++ b/src/legacy_quick_ui_services.cpp @@ -116,9 +116,7 @@ private: activate_legacy_popup_overlay(*popup); - popup->on_popup_close = [tick](Node*) { - tick->destroy(); - }; + pp::panopainter::bind_legacy_popup_close_destroys_overlay(*popup, tick); auto* panel = &panel_; popup->on_brush_changed = [panel, button](Node*, std::shared_ptr& b) { @@ -174,9 +172,7 @@ private: auto c = static_cast(target->m_children[0].get()); panel_.m_picker->set_color(c->m_color); - panel_.m_picker->on_popup_close = [tick](Node*) { - tick->destroy(); - }; + pp::panopainter::bind_legacy_popup_close_destroys_overlay(*panel_.m_picker, tick); auto* panel = &panel_; panel_.m_picker->on_color_change = [panel, c](Node*, glm::vec3 rgb) { diff --git a/src/legacy_ui_overlay_services.h b/src/legacy_ui_overlay_services.h index 52c5622..618dea3 100644 --- a/src/legacy_ui_overlay_services.h +++ b/src/legacy_ui_overlay_services.h @@ -58,4 +58,16 @@ std::shared_ptr add_legacy_overlay_node(App& app) return node; } +template +void bind_legacy_popup_close_destroys_overlay( + PopupT& popup, + const std::shared_ptr& overlay) noexcept +{ + popup.on_popup_close = [overlay](Node*) { + if (overlay) { + overlay->destroy(); + } + }; +} + } // namespace pp::panopainter diff --git a/src/node_panel_stroke.cpp b/src/node_panel_stroke.cpp index e091eed..7217744 100644 --- a/src/node_panel_stroke.cpp +++ b/src/node_panel_stroke.cpp @@ -333,9 +333,7 @@ void NodePanelStroke::init_controls() pp::panopainter::activate_legacy_popup_overlay(*App::I->presets); root()->update(); - App::I->presets->on_popup_close = [this, tick](Node*) { - tick->destroy(); - }; + pp::panopainter::bind_legacy_popup_close_destroys_overlay(*App::I->presets, tick); App::I->presets->on_brush_changed = [this](Node* target, std::shared_ptr& b) { // don't change some params @@ -378,9 +376,7 @@ void NodePanelStroke::init_controls() pp::panopainter::activate_legacy_popup_overlay(*m_brush_popup); root()->update(); - m_brush_popup->on_popup_close = [this, tick](Node*) { - tick->destroy(); - }; + pp::panopainter::bind_legacy_popup_close_destroys_overlay(*m_brush_popup, tick); m_brush_popup->on_brush_changed = [this](Node*, int index) { if (on_brush_changed) @@ -415,9 +411,7 @@ void NodePanelStroke::init_controls() pp::panopainter::activate_legacy_popup_overlay(*m_brush_popup); root()->update(); - m_brush_popup->on_popup_close = [this, tick](Node*) { - tick->destroy(); - }; + pp::panopainter::bind_legacy_popup_close_destroys_overlay(*m_brush_popup, tick); m_brush_popup->on_brush_changed = [this](Node*, int index) { m_dual_enabled->set_value(true, true); @@ -452,9 +446,7 @@ void NodePanelStroke::init_controls() pp::panopainter::activate_legacy_popup_overlay(*m_pattern_popup); root()->update(); - m_pattern_popup->on_popup_close = [this, tick](Node*) { - tick->destroy(); - }; + pp::panopainter::bind_legacy_popup_close_destroys_overlay(*m_pattern_popup, tick); m_pattern_popup->on_brush_changed = [this](Node*, int index) { m_pattern_enabled->set_value(true, true);