diff --git a/docs/modernization/debt.md b/docs/modernization/debt.md index 43a6548..4519e87 100644 --- a/docs/modernization/debt.md +++ b/docs/modernization/debt.md @@ -482,6 +482,11 @@ agent or engineer to remove them without reconstructing context from chat. tip/dual/pattern popups, and brush-panel preset menu insertion no longer call `root()->add_child(...)` directly. Base retained popup widgets such as `NodeComboBox`, raw callback captures, and close/capture semantics remain open. +- 2026-06-12: DEBT-0063 was narrowed again. Retained `NodeComboBox` popups and + Open/Browse delete-confirmation dialogs now initialize and attach through + `src/legacy_ui_overlay_services.*` instead of direct root insertion. Raw + popup callback captures, retained close/capture semantics, 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 @@ -748,7 +753,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, and quick/stroke/brush panel popup root attachment 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, and Open/Browse delete-confirmation dialog insertion 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 7d2b30d..475066a 100644 --- a/docs/modernization/roadmap.md +++ b/docs/modernization/roadmap.md @@ -486,9 +486,9 @@ Edit, Tools, Panels, Options, About, and Layers menu popups, replacing the previous direct template-child indexing in `App::init_menu_*`. The helper now also exposes retained root-popup attachment for `pp_panopainter_ui`, and the quick-panel brush/color popups, stroke-panel preset/tip/dual/pattern popups, -and brush-panel preset menu root insertion route through it. Base retained -popup widgets such as `NodeComboBox`, raw popup callback captures, and close/ -capture semantics remain part of `DEBT-0063`. +brush-panel preset menu root insertion, retained combo-box popups, and +Open/Browse delete-confirmation dialogs route through it. Raw popup callback +captures and close/capture semantics 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/node_combobox.cpp b/src/node_combobox.cpp index 7fba2fb..db37717 100644 --- a/src/node_combobox.cpp +++ b/src/node_combobox.cpp @@ -1,6 +1,7 @@ #include "pch.h" #include "log.h" #include "node_combobox.h" +#include "legacy_ui_overlay_services.h" #include "node_popup_menu.h" Node* NodeComboBox::clone_instantiate() const @@ -24,11 +25,12 @@ void NodeComboBox::loaded() m_text->set_text(m_data[m_current_index].c_str()); m_selected_child_index = m_current_index; on_click = [this](Node* target) { - NodePopupMenu* popup = new NodePopupMenu; + auto popup = std::make_shared(); + popup->set_manager(m_manager); popup->init(); popup->create(); popup->loaded(); - root()->add_child(popup); + (void)pp::panopainter::attach_legacy_overlay_node_to_root(*this, popup); m_items.clear(); for (int i = 0; i < m_data.size(); i++) { diff --git a/src/node_dialog_browse.cpp b/src/node_dialog_browse.cpp index eb864c3..3b594b3 100644 --- a/src/node_dialog_browse.cpp +++ b/src/node_dialog_browse.cpp @@ -7,6 +7,7 @@ #include "node_message_box.h" #include "node_text.h" #include "app.h" +#include "legacy_ui_overlay_services.h" Node* NodeDialogBrowse::clone_instantiate() const { @@ -37,9 +38,7 @@ void NodeDialogBrowse::init_controls() if (!current) return; - auto msgbox = new NodeMessageBox(); - msgbox->set_manager(m_manager); - msgbox->init(); + auto msgbox = pp::panopainter::make_legacy_overlay_node(*App::I); msgbox->m_title->set_text("Delete Project"); msgbox->m_message->set_text(("Are you sure you want to delete " + current->m_file_name + "?").c_str()); msgbox->btn_ok->on_click = [this,msgbox](Node*){ @@ -64,7 +63,7 @@ void NodeDialogBrowse::init_controls() Asset::delete_file(path); msgbox->destroy(); }; - root()->add_child(msgbox); + (void)pp::panopainter::attach_legacy_overlay_node_to_root(*this, msgbox); root()->update(); }; container = find("files-list"); diff --git a/src/node_dialog_open.cpp b/src/node_dialog_open.cpp index faea6e6..142988c 100644 --- a/src/node_dialog_open.cpp +++ b/src/node_dialog_open.cpp @@ -6,6 +6,7 @@ #include "asset.h" #include "node_message_box.h" #include "app.h" +#include "legacy_ui_overlay_services.h" Node* NodeDialogOpen::clone_instantiate() const { @@ -39,9 +40,7 @@ void NodeDialogOpen::init_controls() if (!current) return; - auto msgbox = new NodeMessageBox(); - msgbox->set_manager(m_manager); - msgbox->init(); + auto msgbox = pp::panopainter::make_legacy_overlay_node(*App::I); msgbox->m_title->set_text("Delete Project"); msgbox->m_message->set_text(("Are you sure you want to delete " + current->m_file_name + "?").c_str()); msgbox->btn_ok->on_click = [this,msgbox](Node*){ @@ -65,7 +64,7 @@ void NodeDialogOpen::init_controls() Asset::delete_file(path); msgbox->destroy(); }; - root()->add_child(msgbox); + (void)pp::panopainter::attach_legacy_overlay_node_to_root(*this, msgbox); root()->update(); }; container = find("files-list");