Centralize floating panel restore teardown

This commit is contained in:
2026-06-12 16:23:45 +02:00
parent 3be0f7468c
commit 24cd14c172
3 changed files with 16 additions and 8 deletions

View File

@@ -469,8 +469,8 @@ void App::init_sidebar()
{
if (auto fp = dynamic_cast<NodePanelFloating*>(stroke->m_parent->m_parent))
{
stroke->remove_from_parent();
fp->destroy();
pp::panopainter::detach_legacy_node_from_parent(*stroke);
pp::panopainter::close_legacy_dialog_node(*fp);
}
}
(void)pp::panopainter::attach_legacy_overlay_node(*this, stroke);
@@ -543,8 +543,8 @@ void App::init_sidebar()
{
if (auto fp = dynamic_cast<NodePanelFloating*>(layers->m_parent->m_parent))
{
layers->remove_from_parent();
fp->destroy();
pp::panopainter::detach_legacy_node_from_parent(*layers);
pp::panopainter::close_legacy_dialog_node(*fp);
}
}
(void)pp::panopainter::attach_legacy_overlay_node(*this, layers);
@@ -576,8 +576,8 @@ void App::init_sidebar()
{
if (auto fp = dynamic_cast<NodePanelFloating*>(grid->m_parent->m_parent))
{
grid->remove_from_parent();
fp->destroy();
pp::panopainter::detach_legacy_node_from_parent(*grid);
pp::panopainter::close_legacy_dialog_node(*fp);
}
}
(void)pp::panopainter::attach_legacy_overlay_node(*this, grid);
@@ -1737,7 +1737,7 @@ void App::ui_restore()
{
auto floating_color = f->m_container->add_child<NodePanelColor>();
floating_color->SetHeightP(100);
floating_color->find("title")->destroy();
pp::panopainter::destroy_legacy_node(*floating_color->find("title"));
floating_color->on_color_changed = [this](Node* target, glm::vec4 color) {
apply_brush_color_plan(*this, color, false, false);
};
@@ -1811,7 +1811,7 @@ void App::ui_restore()
{
auto floating_color = f->m_container->add_child<NodePanelColor>();
floating_color->SetHeightP(100);
floating_color->find("title")->destroy();
pp::panopainter::destroy_legacy_node(*floating_color->find("title"));
floating_color->on_color_changed = [this](Node* target, glm::vec4 color) {
apply_brush_color_plan(*this, color, false, false);
};