diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-08-17 11:54:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-17 11:54:12 +0200 |
| commit | 1f65ed6a7d91a9882fd79e7cae80c923e0f96133 (patch) | |
| tree | 5d6aeb526ec96455960b1e123abe20f7c5a92d59 /editor | |
| parent | 985ed5e55abe880025fd3f0cfa484a23d3a0ca32 (diff) | |
| parent | 5542d4a830760affb10b72b50f950341595d2dd7 (diff) | |
Merge pull request #21108 from akien-mga/export-error-color
Export dialog: Fix error color and link alignment
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/project_export.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/editor/project_export.cpp b/editor/project_export.cpp index 170546f14c..3cebbb5d21 100644 --- a/editor/project_export.cpp +++ b/editor/project_export.cpp @@ -231,7 +231,7 @@ void ProjectExportDialog::_edit_preset(int p_index) { if (error != String()) { - Vector<String> items = error.split("\n"); + Vector<String> items = error.split("\n", false); error = ""; for (int i = 0; i < items.size(); i++) { if (i > 0) @@ -756,7 +756,7 @@ void ProjectExportDialog::_export_project_to_path(const String &p_path) { Error err = platform->export_project(current, export_debug->is_pressed(), p_path, 0); if (err != OK) { - error_dialog->set_text(TTR("Export templates for this platform are missing/corrupted: ") + platform->get_name()); + error_dialog->set_text(TTR("Export templates for this platform are missing/corrupted:") + " " + platform->get_name()); error_dialog->show(); error_dialog->popup_centered_minsize(Size2(300, 80)); ERR_PRINT("Failed to export project"); @@ -956,7 +956,7 @@ ProjectExportDialog::ProjectExportDialog() { export_error = memnew(Label); main_vb->add_child(export_error); export_error->hide(); - export_error->add_color_override("font_color", get_color("error_color", "Editor")); + export_error->add_color_override("font_color", EditorNode::get_singleton()->get_gui_base()->get_color("error_color", "Editor")); export_templates_error = memnew(HBoxContainer); main_vb->add_child(export_templates_error); @@ -964,7 +964,7 @@ ProjectExportDialog::ProjectExportDialog() { Label *export_error2 = memnew(Label); export_templates_error->add_child(export_error2); - export_error2->add_color_override("font_color", get_color("error_color", "Editor")); + export_error2->add_color_override("font_color", EditorNode::get_singleton()->get_gui_base()->get_color("error_color", "Editor")); export_error2->set_text(" - " + TTR("Export templates for this platform are missing:") + " "); error_dialog = memnew(AcceptDialog); @@ -975,6 +975,7 @@ ProjectExportDialog::ProjectExportDialog() { LinkButton *download_templates = memnew(LinkButton); download_templates->set_text(TTR("Manage Export Templates")); + download_templates->set_v_size_flags(SIZE_SHRINK_CENTER); export_templates_error->add_child(download_templates); download_templates->connect("pressed", this, "_open_export_template_manager"); |