safe check to all buttons

This commit is contained in:
2018-09-20 00:22:02 +02:00
parent 4d4837721f
commit 27ab21ccdb

View File

@@ -370,40 +370,45 @@ void App::init_menu_file()
popup->m_flood_events = true; popup->m_flood_events = true;
popup->m_capture_children = false; popup->m_capture_children = false;
popup->find<NodeButtonCustom>("file-newdoc")->on_click = [this](Node*) { if (auto b = popup->find<NodeButtonCustom>("file-newdoc"))
dialog_newdoc(); b->on_click = [this](Node*) {
popup->mouse_release(); dialog_newdoc();
popup->destroy(); popup->mouse_release();
}; popup->destroy();
popup->find<NodeButtonCustom>("file-import")->on_click = [this](Node*) { };
App::I.pick_image([](std::string path){ if (auto b = popup->find<NodeButtonCustom>("file-import"))
Canvas::I->import_equirectangular(path); b->on_click = [this](Node*) {
}); App::I.pick_image([](std::string path){
popup->mouse_release(); Canvas::I->import_equirectangular(path);
popup->destroy(); });
}; popup->mouse_release();
popup->find<NodeButtonCustom>("file-open")->on_click = [this](Node*) { popup->destroy();
dialog_open(); };
popup->mouse_release(); if (auto b = popup->find<NodeButtonCustom>("file-open"))
popup->destroy(); b->on_click = [this](Node*) {
}; dialog_open();
popup->find<NodeButtonCustom>("file-browse")->on_click = [this](Node*) { popup->mouse_release();
dialog_browse(); popup->destroy();
popup->mouse_release(); };
popup->destroy(); if (auto b = popup->find<NodeButtonCustom>("file-browse"))
}; b->on_click = [this](Node*) {
popup->find<NodeButtonCustom>("file-save")->on_click = [this](Node*) { dialog_browse();
if (ui::Canvas::I->m_newdoc) popup->mouse_release();
{ popup->destroy();
dialog_save(); };
} if (auto b = popup->find<NodeButtonCustom>("file-save"))
else if(ui::Canvas::I->m_unsaved) b->on_click = [this](Node*) {
{ if (ui::Canvas::I->m_newdoc)
canvas->m_canvas->project_save(); {
} dialog_save();
popup->mouse_release(); }
popup->destroy(); else if(ui::Canvas::I->m_unsaved)
}; {
canvas->m_canvas->project_save();
}
popup->mouse_release();
popup->destroy();
};
if (auto b = popup->find<NodeButtonCustom>("file-save-as")) if (auto b = popup->find<NodeButtonCustom>("file-save-as"))
b->on_click = [this](Node*) { b->on_click = [this](Node*) {
dialog_save(); dialog_save();