recover lost commit
This commit is contained in:
@@ -354,7 +354,10 @@ void App::init_sidebar()
|
||||
if (grid->m_parent)
|
||||
{
|
||||
if (auto fp = dynamic_cast<NodePanelFloating*>(grid->m_parent->m_parent))
|
||||
{
|
||||
grid->remove_from_parent();
|
||||
fp->destroy();
|
||||
}
|
||||
}
|
||||
layout[main_id]->add_child(grid);
|
||||
auto tick = layout[main_id]->add_child<NodeImage>();
|
||||
|
||||
@@ -45,6 +45,7 @@ void NodeDialogCloud::loaded()
|
||||
|
||||
void NodeDialogCloud::removed(Node* parent)
|
||||
{
|
||||
NodeBorder::removed(parent);
|
||||
closed = true;
|
||||
}
|
||||
|
||||
|
||||
@@ -19,6 +19,7 @@ void NodeProgressBar::init()
|
||||
btn_cancel = find<NodeButton>("btn-cancel");
|
||||
btn_cancel->on_click = [&](Node*) { destroy(); };
|
||||
m_progress = find<NodeBorder>("progress");
|
||||
m_body = find<NodeBorder>("body");
|
||||
|
||||
m_progress->SetWidthP(0);
|
||||
}
|
||||
@@ -34,3 +35,9 @@ void NodeProgressBar::set_progress(float p) noexcept
|
||||
{
|
||||
m_progress->SetWidthP(p * 100.f);
|
||||
}
|
||||
|
||||
void NodeProgressBar::added(Node* parent)
|
||||
{
|
||||
NodeBorder::added(parent);
|
||||
m_body->mouse_capture();
|
||||
}
|
||||
|
||||
@@ -11,6 +11,7 @@ public:
|
||||
NodeButton* btn_cancel;
|
||||
NodeText* m_title;
|
||||
NodeBorder* m_progress;
|
||||
NodeBorder* m_body;
|
||||
int m_total = 0;
|
||||
int m_count = 0;
|
||||
virtual Node* clone_instantiate() const override;
|
||||
@@ -18,4 +19,5 @@ public:
|
||||
void increment() noexcept;
|
||||
// set progress where p [0, 1]
|
||||
void set_progress(float p) noexcept;
|
||||
virtual void added(Node* parent) override;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user