Some theme and usability improvements

Fixed create script editor dialog not changing extension
Options menu for inspector element is bigger
This commit is contained in:
Daniel J. Ramirez 2017-07-31 13:19:45 -05:00
parent 597e5ebedf
commit cd8feed0df
7 changed files with 78 additions and 52 deletions

View file

@ -29,11 +29,12 @@
/*************************************************************************/
#include "script_create_dialog.h"
#include "editor/editor_node.h"
#include "editor/editor_scale.h"
#include "editor_file_system.h"
#include "project_settings.h"
#include "io/resource_saver.h"
#include "os/file_access.h"
#include "project_settings.h"
#include "script_language.h"
void ScriptCreateDialog::_notification(int p_what) {
@ -229,7 +230,7 @@ void ScriptCreateDialog::_lang_changed(int l) {
List<String> extensions;
// get all possible extensions for script
for (int l = 0; l < language_menu->get_item_count(); l++) {
language->get_recognized_extensions(&extensions);
ScriptServer::get_language(l)->get_recognized_extensions(&extensions);
}
for (List<String>::Element *E = extensions.front(); E; E = E->next()) {
@ -240,8 +241,11 @@ void ScriptCreateDialog::_lang_changed(int l) {
}
}
}
file_path->set_text(path);
} else {
path = "class" + selected_ext;
_path_changed(path);
}
file_path->set_text(path);
bool use_templates = language->is_using_templates();
template_menu->set_disabled(!use_templates);
@ -403,9 +407,9 @@ void ScriptCreateDialog::_msg_script_valid(bool valid, const String &p_msg) {
error_label->set_text(TTR(p_msg));
if (valid) {
error_label->add_color_override("font_color", Color(0, 1.0, 0.8, 0.8));
error_label->add_color_override("font_color", get_color("success_color", "Editor"));
} else {
error_label->add_color_override("font_color", Color(1, 0.2, 0.2, 0.8));
error_label->add_color_override("font_color", get_color("error_color", "Editor"));
}
}
@ -413,9 +417,9 @@ void ScriptCreateDialog::_msg_path_valid(bool valid, const String &p_msg) {
path_error_label->set_text(TTR(p_msg));
if (valid) {
path_error_label->add_color_override("font_color", Color(0, 1.0, 0.8, 0.8));
path_error_label->add_color_override("font_color", get_color("success_color", "Editor"));
} else {
path_error_label->add_color_override("font_color", Color(1, 0.4, 0.0, 0.8));
path_error_label->add_color_override("font_color", get_color("error_color", "Editor"));
}
}
@ -543,19 +547,6 @@ ScriptCreateDialog::ScriptCreateDialog() {
gc = memnew(GridContainer);
gc->set_columns(2);
/* Error Stylebox Background */
StyleBoxFlat *sb = memnew(StyleBoxFlat);
sb->set_bg_color(Color(0, 0, 0, 0.05));
sb->set_light_color(Color(1, 1, 1, 0.05));
sb->set_dark_color(Color(1, 1, 1, 0.05));
sb->set_border_blend(false);
sb->set_border_size(1);
sb->set_default_margin(MARGIN_TOP, 10.0 * EDSCALE);
sb->set_default_margin(MARGIN_BOTTOM, 10.0 * EDSCALE);
sb->set_default_margin(MARGIN_LEFT, 10.0 * EDSCALE);
sb->set_default_margin(MARGIN_RIGHT, 10.0 * EDSCALE);
/* Error Messages Field */
vb = memnew(VBoxContainer);
@ -582,7 +573,7 @@ ScriptCreateDialog::ScriptCreateDialog() {
pc = memnew(PanelContainer);
pc->set_h_size_flags(Control::SIZE_FILL);
pc->add_style_override("panel", sb);
pc->add_style_override("panel", EditorNode::get_singleton()->get_gui_base()->get_stylebox("bg", "Tree"));
pc->add_child(vb);
/* Margins */