omar/panopainter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix manager assignment

Browse Source
This commit is contained in:
omigamedev
2019-09-26 19:49:57 +02:00
parent 13b2f6eb07
commit 755e1ff856
12 changed files with 44 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/app_layout.cpp
View File

@@ -73,7 +73,7 @@ void App::init_toolbar_main()
{
button->on_click = [this](Node*) {
msgbox = new NodeMessageBox();
msgbox->m_manager = &layout;
msgbox->set_manager(&layout);
msgbox->init();
layout[main_id]->add_child(msgbox);
};
@@ -82,7 +82,7 @@ void App::init_toolbar_main()
{
button->on_click = [this](Node*) {
settings = new NodeSettings();
settings->m_manager = &layout;
settings->set_manager(&layout);
settings->init();
layout[main_id]->add_child(settings);
};
@@ -93,7 +93,7 @@ template <class T> std::shared_ptr<T> create_panel(LayoutManager& manager)
{
std::shared_ptr<T> ret;
ret = std::make_shared<T>();
ret->m_manager = &manager;
ret->set_manager(&manager);
ret->init();
ret->create();
ret->loaded();
@@ -1405,13 +1405,12 @@ void App::initLayout()
layout.load("data/layout.xml");
LOG("initializing layout completed");
//LOG("initializing layout designer xml");
//layout_designer.on_loaded = [&](bool reloaded) {
// if (!reloaded)
// layout_designer.create();
// layout_designer[main_id]->add_child(layout_designer.instantiate("changelog"));
//};
//layout_designer.load("data/dialogs/changelog.xml");
LOG("initializing layout designer xml");
layout_designer.on_loaded = [&](bool reloaded) {
layout_designer.create();
layout_designer[main_id]->add_child(layout_designer.instantiate("usermanual"));
};
//layout_designer.load("data/dialogs/usermanual.xml");
}
void App::set_ui_scale(float scale)