fix floating panels, save ppbr imported

This commit is contained in:
2019-09-19 17:21:31 +02:00
parent 62b988ea0a
commit 70fa29839e
4 changed files with 11 additions and 2 deletions

View File

@@ -245,7 +245,10 @@ void App::init_sidebar()
if (stroke->m_parent)
{
if (auto fp = dynamic_cast<NodePanelFloating*>(stroke->m_parent->m_parent))
{
stroke->remove_from_parent();
fp->destroy();
}
}
layout[main_id]->add_child(stroke);
stroke->SetSize(350, glm::max(100.f, screen.y - pos.y - 50.f));
@@ -321,7 +324,10 @@ void App::init_sidebar()
if (layers->m_parent)
{
if (auto fp = dynamic_cast<NodePanelFloating*>(layers->m_parent->m_parent))
{
layers->remove_from_parent();
fp->destroy();
}
}
layout[main_id]->add_child(layers);
auto tick = layout[main_id]->add_child<NodeImage>();
@@ -769,6 +775,7 @@ void App::init_menu_tools()
fpanel->m_class = NodePanelFloating::kClass::Presets;
fpanel->SetHeight(300);
fpanel->SetMinHeight(300);
fpanel->SetMinWidth(100);
if (!floating_presets)
{
floating_presets = fpanel->m_container->add_child_ref<NodePanelBrushPreset>();