App::I static singleton to pointer

This commit is contained in:
2019-07-11 18:08:17 +02:00
parent 92dd00d910
commit b89274e7a6
33 changed files with 417 additions and 412 deletions

View File

@@ -39,8 +39,8 @@
void Node::app_redraw()
{
App::I.redraw = true;
App::I.ui_cv.notify_all();
App::I->redraw = true;
App::I->ui_cv.notify_all();
}
void Node::watch(std::function<bool(Node*)> observer)
@@ -303,7 +303,7 @@ void Node::removed(Node* parent)
const Node* Node::init_template(const char* id)
{
Node* m_template = nullptr;
App::I.ui_task([&]
App::I->ui_task([&]
{
auto hid = const_hash(id);
Node* top = m_manager->get(hid);
@@ -324,7 +324,7 @@ const Node* Node::init_template(const char* id)
void Node::add_child(Node* n)
{
App::I.ui_task([&]
App::I->ui_task([&]
{
if (n->m_parent)
n->m_parent->remove_child(n);
@@ -339,7 +339,7 @@ void Node::add_child(Node* n)
void Node::add_child(Node* n, int index)
{
App::I.ui_task([&]
App::I->ui_task([&]
{
if (n->m_parent)
n->m_parent->remove_child(n);
@@ -354,7 +354,7 @@ void Node::add_child(Node* n, int index)
void Node::add_child(std::shared_ptr<Node> n)
{
App::I.ui_task([&]
App::I->ui_task([&]
{
if (n->m_parent)
n->m_parent->remove_child(n.get());
@@ -369,7 +369,7 @@ void Node::add_child(std::shared_ptr<Node> n)
void Node::add_child(std::shared_ptr<Node> n, int index)
{
App::I.ui_task([&]
App::I->ui_task([&]
{
if (n->m_parent)
n->m_parent->remove_child(n.get());
@@ -393,7 +393,7 @@ void Node::remove_child(Node* n)
auto i = std::find_if(m_children.begin(), m_children.end(), [=](auto& ptr) { return ptr.get() == n; });
if (i != m_children.end())
{
App::I.ui_task([&]
App::I->ui_task([&]
{
n->removed(this);
n->m_parent = nullptr;
@@ -408,7 +408,7 @@ void Node::remove_child(Node* n)
void Node::remove_all_children()
{
App::I.ui_task([&]
App::I->ui_task([&]
{
for (auto& n : m_children)
{
@@ -424,7 +424,7 @@ void Node::remove_all_children()
void Node::move_child(Node* n, int index)
{
App::I.ui_task([&]
App::I->ui_task([&]
{
YGNodeRemoveChild(y_node, n->y_node);
YGNodeInsertChild(y_node, n->y_node, index);
@@ -438,7 +438,7 @@ void Node::move_child(Node* n, int index)
void Node::move_child_front(Node* n)
{
App::I.ui_task([&]
App::I->ui_task([&]
{
int count = YGNodeGetChildCount(y_node);
move_child(n, count - 1);
@@ -447,7 +447,7 @@ void Node::move_child_front(Node* n)
void Node::move_child_offset(Node* n, int offset)
{
App::I.ui_task([&]
App::I->ui_task([&]
{
int count = YGNodeGetChildCount(y_node);
for (int i = 0; i < count; i++)
@@ -879,7 +879,7 @@ void Node::SetRTL(YGDirection dir)
void Node::SetVisibility(bool visible)
{
App::I.ui_task([&]
App::I->ui_task([&]
{
if (m_display && !visible)
{