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

This commit is contained in:
2018-11-27 14:24:01 +01:00
parent f34ffa825d
commit 0c6b409606
57 changed files with 538 additions and 597 deletions

View File

@@ -32,7 +32,7 @@ void NodeDialogResize::init_controls()
btn_cancel = find<NodeButton>("btn-cancel");
combo = find<NodeComboBox>("resolution");
text = find<NodeText>("current-res");
resolution = ui::Canvas::I->m_width;
resolution = Canvas::I->m_width;
static char txt[128];
sprintf(txt, "Current: %s", App::I.res_to_string(resolution).c_str());
text->set_text(txt);
@@ -43,7 +43,7 @@ void NodeDialogResize::init_controls()
void NodeDialogResize::loaded()
{
// ui::Image thumb = ui::Canvas::I->thumbnail_read(data_path);
// Image thumb = Canvas::I->thumbnail_read(data_path);
// auto image_tex = find<NodeImageTexture>("thumb-tex");
// image_tex->tex.create(thumb);
}