don't destroytoolbar on presets floating panel
This commit is contained in:
@@ -791,7 +791,7 @@ void App::init_menu_tools()
|
|||||||
floating_presets = fpanel->m_container->add_child_ref<NodePanelBrushPreset>();
|
floating_presets = fpanel->m_container->add_child_ref<NodePanelBrushPreset>();
|
||||||
floating_presets->SetHeightP(100);
|
floating_presets->SetHeightP(100);
|
||||||
//floating_presets->SetFlexGrow(1);
|
//floating_presets->SetFlexGrow(1);
|
||||||
floating_presets->find("toolbar")->destroy();
|
//floating_presets->find("toolbar")->destroy();
|
||||||
floating_presets->on_brush_changed = [this](Node* target, std::shared_ptr<Brush>& b) {
|
floating_presets->on_brush_changed = [this](Node* target, std::shared_ptr<Brush>& b) {
|
||||||
auto c = Canvas::I->m_current_brush->m_tip_color;
|
auto c = Canvas::I->m_current_brush->m_tip_color;
|
||||||
*Canvas::I->m_current_brush = *b;
|
*Canvas::I->m_current_brush = *b;
|
||||||
@@ -1577,7 +1577,7 @@ void App::ui_restore()
|
|||||||
{
|
{
|
||||||
auto floating_presets = f->m_container->add_child<NodePanelBrushPreset>();
|
auto floating_presets = f->m_container->add_child<NodePanelBrushPreset>();
|
||||||
floating_presets->SetHeightP(100);
|
floating_presets->SetHeightP(100);
|
||||||
floating_presets->find("toolbar")->destroy();
|
//floating_presets->find("toolbar")->destroy();
|
||||||
floating_presets->on_brush_changed = [this](Node* target, std::shared_ptr<Brush>& b) {
|
floating_presets->on_brush_changed = [this](Node* target, std::shared_ptr<Brush>& b) {
|
||||||
auto c = Canvas::I->m_current_brush->m_tip_color;
|
auto c = Canvas::I->m_current_brush->m_tip_color;
|
||||||
*Canvas::I->m_current_brush = *b;
|
*Canvas::I->m_current_brush = *b;
|
||||||
@@ -1654,7 +1654,7 @@ void App::ui_restore()
|
|||||||
{
|
{
|
||||||
auto floating_presets = f->m_container->add_child<NodePanelBrushPreset>();
|
auto floating_presets = f->m_container->add_child<NodePanelBrushPreset>();
|
||||||
floating_presets->SetHeightP(100);
|
floating_presets->SetHeightP(100);
|
||||||
floating_presets->find("toolbar")->destroy();
|
//floating_presets->find("toolbar")->destroy();
|
||||||
floating_presets->on_brush_changed = [this](Node* target, std::shared_ptr<Brush>& b) {
|
floating_presets->on_brush_changed = [this](Node* target, std::shared_ptr<Brush>& b) {
|
||||||
auto c = Canvas::I->m_current_brush->m_tip_color;
|
auto c = Canvas::I->m_current_brush->m_tip_color;
|
||||||
*Canvas::I->m_current_brush = *b;
|
*Canvas::I->m_current_brush = *b;
|
||||||
|
|||||||
Reference in New Issue
Block a user