Cleaning for mesh addition.

This commit is contained in:
James Grogan 2022-11-13 17:02:09 +00:00
parent 8e0ce22b57
commit 402f381d10
67 changed files with 655 additions and 456 deletions

View file

@ -11,8 +11,6 @@ int main(int argc, char *argv[])
auto main_app = MainApplication::Create();
main_app->initialize(std::move(command_line_args));
main_app->Run();
main_app->ShutDown();
main_app->run();
return 0;
}

View file

@ -56,10 +56,10 @@ void MediaTool::initializeViews()
auto button = Button::Create();
button->setLabel("Click!");
button->setBounds(100, 200);
button->setBackgroundColor(Color::Create(0, 0, 255, 0));
button->setBackgroundColor(Color(0, 0, 255, 0));
auto background_widget = Widget::Create();
background_widget->setBackgroundColor(Color::Create(0, 255, 255, 0));
background_widget->setBackgroundColor(Color(0, 255, 255, 0));
auto horizontal_spacer = HorizontalSpacer::Create();
horizontal_spacer->addWidgetWithScale(std::move(button), 1);

View file

@ -7,7 +7,7 @@ AudioEditorView::AudioEditorView()
{
auto label = Label::Create();
label->setLabel("Audio Editor");
label->setBackgroundColor(Color::Create(200, 189, 160));
label->setBackgroundColor(Color(200, 189, 160));
label->setMargin(1);
addWidget(std::move(label));
}

View file

@ -7,7 +7,7 @@ ImageEditorView::ImageEditorView()
{
auto label = Label::Create();
label->setLabel("Image Editor");
label->setBackgroundColor(Color::Create(200, 189, 160));
label->setBackgroundColor(Color(200, 189, 160));
label->setMargin(1);
addWidget(std::move(label));
}

View file

@ -19,7 +19,7 @@ void TextEditorView::Initialize()
{
auto label = Label::Create();
label->setLabel("Text Editor");
label->setBackgroundColor(Color::Create(181, 189, 200));
label->setBackgroundColor(Color(181, 189, 200));
label->setMargin(1);
auto textBox = TextBox::Create();
@ -27,12 +27,12 @@ void TextEditorView::Initialize()
auto saveButton = Button::Create();
saveButton->setLabel("Save");
saveButton->setBackgroundColor(Color::Create(200, 200, 200));
saveButton->setBackgroundColor(Color(200, 200, 200));
saveButton->setMargin(2);
auto onSave = [this](Widget* self){
if(this && mController && mTextBox)
{
mController->SetContent(mTextBox->GetContent());
mController->SetContent(mTextBox->getContent());
mController->OnSave();
};
};
@ -40,26 +40,26 @@ void TextEditorView::Initialize()
auto clearButton = Button::Create();
clearButton->setLabel("Clear");
clearButton->setBackgroundColor(Color::Create(200, 200, 200));
clearButton->setBackgroundColor(Color(200, 200, 200));
clearButton->setMargin(2);
auto onClear = [this](Widget* self){
if(this && mController && mTextBox)
{
mController->OnClear();
mTextBox->SetContent("");
mTextBox->setContent("");
};
};
clearButton->setOnClickFunction(onClear);
auto loadButton = Button::Create();
loadButton->setLabel("Load");
loadButton->setBackgroundColor(Color::Create(200, 200, 200));
loadButton->setBackgroundColor(Color(200, 200, 200));
loadButton->setMargin(2);
auto onLoad = [this](Widget* self){
if(this && mController && mTextBox)
{
mController->OnLoad();
mTextBox->SetContent(mController->GetContent());
mTextBox->setContent(mController->GetContent());
};
};
loadButton->setOnClickFunction(onLoad);

View file

@ -7,7 +7,7 @@ WebClientView::WebClientView()
{
auto label = Label::Create();
label->setLabel("Web Client");
label->setBackgroundColor(Color::Create(200, 189, 160));
label->setBackgroundColor(Color(200, 189, 160));
label->setMargin(1);
addWidget(std::move(label));
}