Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

In Create New Scene dialog derive the default root node name based on editor/naming/node_name_casing #79756

Merged
merged 1 commit into from
Aug 2, 2023
Merged

In Create New Scene dialog derive the default root node name based on editor/naming/node_name_casing #79756

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 21 additions & 3 deletions editor/scene_create_dialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,10 +130,25 @@ void SceneCreateDialog::update_dialog() {

root_name = root_name_edit->get_text().strip_edges();
if (root_name.is_empty()) {
root_name = scene_name.get_file().get_basename();
root_name = scene_name_edit->get_text().strip_edges();

if (root_name.is_empty()) {
root_name_edit->set_placeholder(TTR("Leave empty to derive from scene name"));
} else {
// Respect the desired root node casing from ProjectSettings and ensure it's a valid node name.
String adjusted_root_name = Node::adjust_name_casing(root_name);
root_name = adjusted_root_name.validate_node_name();

bool has_invalid_characters = root_name != adjusted_root_name;
if (has_invalid_characters) {
update_error(node_error_label, MSG_WARNING, TTR("Invalid root node name characters have been replaced."));
}

root_name_edit->set_placeholder(root_name);
}
}

if (root_name.is_empty() || root_name.validate_node_name().size() != root_name.size()) {
if (root_name.is_empty() || root_name.validate_node_name() != root_name) {
update_error(node_error_label, MSG_ERROR, TTR("Invalid root node name."));
is_valid = false;
}
Expand All @@ -150,6 +165,9 @@ void SceneCreateDialog::update_error(Label *p_label, MsgType p_type, const Strin
case MSG_ERROR:
p_label->add_theme_color_override("font_color", get_theme_color(SNAME("error_color"), SNAME("Editor")));
break;
case MSG_WARNING:
p_label->add_theme_color_override("font_color", get_theme_color(SNAME("warning_color"), SNAME("Editor")));
break;
}
}

Expand Down Expand Up @@ -285,7 +303,7 @@ SceneCreateDialog::SceneCreateDialog() {

root_name_edit = memnew(LineEdit);
gc->add_child(root_name_edit);
root_name_edit->set_placeholder(TTR("Leave empty to use scene name"));
root_name_edit->set_tooltip_text(TTR("When empty, the root node name is derived from the scene name based on the \"editor/naming/node_name_casing\" project setting."));
root_name_edit->set_h_size_flags(Control::SIZE_EXPAND_FILL);
root_name_edit->connect("text_changed", callable_mp(this, &SceneCreateDialog::update_dialog).unbind(1));
root_name_edit->connect("text_submitted", callable_mp(this, &SceneCreateDialog::accept_create).unbind(1));
Expand Down
1 change: 1 addition & 0 deletions editor/scene_create_dialog.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ class SceneCreateDialog : public ConfirmationDialog {
enum MsgType {
MSG_OK,
MSG_ERROR,
MSG_WARNING,
};

const StringName type_meta = StringName("type");
Expand Down