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

remove ui namespace which is not really used, move CameraData in camera_modes.h to avoid the inclusion of canva.h

Browse Source
This commit is contained in:
omigamedev
2018-11-27 14:24:01 +01:00
parent f34ffa825d
commit 0c6b409606
57 changed files with 538 additions and 597 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/app_dialogs.cpp
View File

@@ -154,7 +154,7 @@ void App::dialog_newdoc()
if (canvas)
{
if (ui::Canvas::I->m_unsaved)
if (Canvas::I->m_unsaved)
{
auto m = layout[main_id]->add_child<NodeMessageBox>();
m->m_title->set_text("Unsaved document");
@@ -162,7 +162,7 @@ void App::dialog_newdoc()
m->btn_ok->m_text->set_text("Yes");
m->btn_cancel->m_text->set_text("No");
m->btn_ok->on_click = [this, m, show_dialog](Node*) {
ui::Canvas::I->project_save([this, m, show_dialog](bool success){
Canvas::I->project_save([this, m, show_dialog](bool success){
if (success)
show_dialog();
else
@@ -218,7 +218,7 @@ void App::dialog_open()
if (canvas)
{
if (ui::Canvas::I->m_unsaved)
if (Canvas::I->m_unsaved)
{
auto m = layout[main_id]->add_child<NodeMessageBox>();
m->m_title->set_text("Unsaved document");
@@ -226,7 +226,7 @@ void App::dialog_open()
m->btn_ok->m_text->set_text("Yes");
m->btn_cancel->m_text->set_text("No");
m->btn_ok->on_click = [this,m,show_dialog](Node*){
ui::Canvas::I->project_save([this,m,show_dialog](bool success){
Canvas::I->project_save([this,m,show_dialog](bool success){
if (success)
show_dialog();
else
@@ -278,7 +278,7 @@ void App::dialog_browse()
if (canvas)
{
if (ui::Canvas::I->m_unsaved)
if (Canvas::I->m_unsaved)
{
auto m = layout[main_id]->add_child<NodeMessageBox>();
m->m_title->set_text("Unsaved document");
@@ -286,7 +286,7 @@ void App::dialog_browse()
m->btn_ok->m_text->set_text("Yes");
m->btn_cancel->m_text->set_text("No");
m->btn_ok->on_click = [this, m, show_dialog](Node*) {
ui::Canvas::I->project_save([this, m, show_dialog](bool success){
Canvas::I->project_save([this, m, show_dialog](bool success){
if (success)
show_dialog();
else