diff --git a/docs/modernization/debt.md b/docs/modernization/debt.md index 56dbf44..73080a2 100644 --- a/docs/modernization/debt.md +++ b/docs/modernization/debt.md @@ -493,6 +493,11 @@ agent or engineer to remove them without reconstructing context from chat. `src/legacy_ui_overlay_services.*` instead of direct root insertion or temporary panel child insertion. Raw popup callback captures, retained close/capture semantics, and broader `Node` handle adoption remain open. +- 2026-06-12: DEBT-0063 was narrowed again. Retained popup + mouse-ignore/flood-events/capture-children setup and mouse capture activation + for top-toolbar, quick-panel, stroke-panel, and combo-box popups now route + through `src/legacy_ui_overlay_services.*`. Raw popup callback captures, + retained close 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 @@ -759,7 +764,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, and top-toolbar panel popup 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-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, and repeated retained popup activation flag setup 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 dec197d..6730c50 100644 --- a/docs/modernization/roadmap.md +++ b/docs/modernization/roadmap.md @@ -488,8 +488,10 @@ also exposes retained root-popup attachment for `pp_panopainter_ui`, and the quick-panel brush/color popups, stroke-panel preset/tip/dual/pattern popups, brush-panel preset menu root insertion, retained combo-box popups, Open/Browse delete-confirmation dialogs, popup tick decoration nodes, and -top-toolbar panel popups route through it. Raw popup callback captures and -close/capture semantics remain part of `DEBT-0063`. +top-toolbar panel popups route through it. The helper also centralizes retained +popup mouse-ignore/flood/capture-child activation for those popup families. +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 56cf0ad..dba423d 100644 --- a/src/app_layout.cpp +++ b/src/app_layout.cpp @@ -486,9 +486,7 @@ void App::init_sidebar() stroke->SetPosition(pos.x - stroke->m_size.x / 2.f, pos.y + 16); stroke->SetPositioning(YGPositionTypeAbsolute); - stroke->m_capture_children = false; - stroke->m_mouse_ignore = false; - stroke->mouse_capture(); + pp::panopainter::activate_legacy_popup_overlay(*stroke); auto scroll = stroke->find("scroller"); //scroll->SetHeight(glm::max(100.f, screen.y - pos.y - 200.f)); @@ -531,9 +529,7 @@ void App::init_sidebar() color->SetPosition(pos.x - color->m_size.x / 2.f, pos.y + 16); color->SetPositioning(YGPositionTypeAbsolute); - color->m_capture_children = false; - color->m_mouse_ignore = false; - color->mouse_capture(); + pp::panopainter::activate_legacy_popup_overlay(*color); color->on_popup_close = [this, tick](Node*) { tick->destroy(); @@ -566,9 +562,7 @@ void App::init_sidebar() layers->SetPosition(pos.x - layers->m_size.x / 2.f, pos.y + 16); layers->SetPositioning(YGPositionTypeAbsolute); - layers->m_capture_children = false; - layers->m_mouse_ignore = false; - layers->mouse_capture(); + pp::panopainter::activate_legacy_popup_overlay(*layers); auto scroll = layers->find("layers-container"); scroll->SetMaxHeight(glm::max(100.f, screen.y - pos.y - 200.f)); @@ -603,9 +597,7 @@ void App::init_sidebar() grid->SetPosition(pos.x - grid->m_size.x / 2.f, pos.y + 16); grid->SetPositioning(YGPositionTypeAbsolute); - grid->m_capture_children = false; - grid->m_mouse_ignore = false; - grid->mouse_capture(); + pp::panopainter::activate_legacy_popup_overlay(*grid); auto scroll = grid->find("scroller"); scroll->SetMaxHeight(glm::max(100.f, screen.y - pos.y - 250.f)); diff --git a/src/legacy_quick_ui_services.cpp b/src/legacy_quick_ui_services.cpp index 912e3a7..f0791b5 100644 --- a/src/legacy_quick_ui_services.cpp +++ b/src/legacy_quick_ui_services.cpp @@ -114,10 +114,7 @@ private: tick->SetPosition(tick_pos.x, tick_pos.y + (button->m_size.y - tick_sz.y) * 0.5f); popup->update(); - popup->m_mouse_ignore = false; - popup->m_flood_events = true; - popup->m_capture_children = false; - popup->mouse_capture(); + activate_legacy_popup_overlay(*popup); popup->on_popup_close = [tick](Node*) { tick->destroy(); @@ -173,10 +170,7 @@ private: tick->SetPosition(tick_pos.x, tick_pos.y + (target->m_size.y - tick_sz.y) * 0.5f); popup->update(); - popup->m_mouse_ignore = false; - popup->m_flood_events = true; - popup->m_capture_children = false; - popup->mouse_capture(); + activate_legacy_popup_overlay(*popup); auto c = static_cast(target->m_children[0].get()); panel_.m_picker->set_color(c->m_color); diff --git a/src/legacy_ui_overlay_services.cpp b/src/legacy_ui_overlay_services.cpp index 4973d69..9077103 100644 --- a/src/legacy_ui_overlay_services.cpp +++ b/src/legacy_ui_overlay_services.cpp @@ -15,6 +15,19 @@ void initialize_legacy_overlay_node(App& app, Node& node) node.loaded(); } +void configure_legacy_popup_overlay(Node& node) noexcept +{ + node.m_mouse_ignore = false; + node.m_flood_events = true; + node.m_capture_children = false; +} + +void activate_legacy_popup_overlay(Node& node) noexcept +{ + configure_legacy_popup_overlay(node); + node.mouse_capture(); +} + pp::foundation::Status attach_legacy_overlay_node( App& app, const std::shared_ptr& node) noexcept diff --git a/src/legacy_ui_overlay_services.h b/src/legacy_ui_overlay_services.h index d72d6d5..2cca8be 100644 --- a/src/legacy_ui_overlay_services.h +++ b/src/legacy_ui_overlay_services.h @@ -12,6 +12,9 @@ namespace pp::panopainter { void initialize_legacy_overlay_node(App& app, Node& node); +void configure_legacy_popup_overlay(Node& node) noexcept; +void activate_legacy_popup_overlay(Node& node) noexcept; + [[nodiscard]] pp::foundation::Status attach_legacy_overlay_node( App& app, const std::shared_ptr& node) noexcept; diff --git a/src/node_combobox.cpp b/src/node_combobox.cpp index db37717..300b629 100644 --- a/src/node_combobox.cpp +++ b/src/node_combobox.cpp @@ -76,10 +76,7 @@ void NodeComboBox::loaded() popup->SetFlexGrow(1.f); popup->update(); root()->update(); - popup->mouse_capture(); - popup->m_mouse_ignore = false; - popup->m_flood_events = true; - popup->m_capture_children = false; + pp::panopainter::activate_legacy_popup_overlay(*popup); }; } diff --git a/src/node_panel_stroke.cpp b/src/node_panel_stroke.cpp index 1ad77ce..e091eed 100644 --- a/src/node_panel_stroke.cpp +++ b/src/node_panel_stroke.cpp @@ -270,9 +270,7 @@ void NodePanelStroke::init_controls() m_brush_popup->loaded(); m_brush_popup->SetPositioning(YGPositionTypeAbsolute); m_brush_popup->SetSize(300, 400); - m_brush_popup->m_mouse_ignore = false; - m_brush_popup->m_flood_events = true; - m_brush_popup->m_capture_children = false; + pp::panopainter::configure_legacy_popup_overlay(*m_brush_popup); m_pattern_popup = std::make_shared(); m_pattern_popup->set_manager(m_manager); @@ -282,9 +280,7 @@ void NodePanelStroke::init_controls() m_pattern_popup->loaded(); m_pattern_popup->SetPositioning(YGPositionTypeAbsolute); m_pattern_popup->SetSize(300, 400); - m_pattern_popup->m_mouse_ignore = false; - m_pattern_popup->m_flood_events = true; - m_pattern_popup->m_capture_children = false; + pp::panopainter::configure_legacy_popup_overlay(*m_pattern_popup); //m_presets_popup = std::make_shared(); //m_presets_popup->m_manager = m_manager; @@ -334,10 +330,7 @@ void NodePanelStroke::init_controls() pos.y = 0; App::I->presets->SetPosition(pos.x + 16, pos.y); App::I->presets->SetPositioning(YGPositionTypeAbsolute); - App::I->presets->m_mouse_ignore = false; - App::I->presets->m_flood_events = true; - App::I->presets->m_capture_children = false; - App::I->presets->mouse_capture(); + pp::panopainter::activate_legacy_popup_overlay(*App::I->presets); root()->update(); App::I->presets->on_popup_close = [this, tick](Node*) { @@ -382,7 +375,7 @@ void NodePanelStroke::init_controls() if (pos.y < 0) pos.y = 0; m_brush_popup->SetPosition(pos.x + 16, pos.y); - m_brush_popup->mouse_capture(); + pp::panopainter::activate_legacy_popup_overlay(*m_brush_popup); root()->update(); m_brush_popup->on_popup_close = [this, tick](Node*) { @@ -419,7 +412,7 @@ void NodePanelStroke::init_controls() if (pos.y < 0) pos.y = 0; m_brush_popup->SetPosition(pos.x + 16, pos.y); - m_brush_popup->mouse_capture(); + pp::panopainter::activate_legacy_popup_overlay(*m_brush_popup); root()->update(); m_brush_popup->on_popup_close = [this, tick](Node*) { @@ -456,7 +449,7 @@ void NodePanelStroke::init_controls() if (pos.y < 0) pos.y = 0; m_pattern_popup->SetPosition(pos.x + 16, pos.y); - m_pattern_popup->mouse_capture(); + pp::panopainter::activate_legacy_popup_overlay(*m_pattern_popup); root()->update(); m_pattern_popup->on_popup_close = [this, tick](Node*) {