godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-08 12:40:44 +00:00
Code Releases Wiki Activity

Merge pull request #86386 from timothyqiu/empty-layout-name

Browse Source 
Strip edges of editor layout names
This commit is contained in:
Rémi Verschelde
2024-04-10 14:21:37 +02:00
parent 09be7329a2 23d50b1117
commit 492c19732e
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
editor/editor_layouts_dialog.cpp
View File

@@ -31,8 +31,6 @@
#include "editor_layouts_dialog.h" #include "editor_layouts_dialog.h"
#include "core/io/config_file.h" #include "core/io/config_file.h"
#include "core/object/class_db.h"
#include "core/os/keyboard.h"
#include "editor/editor_settings.h" #include "editor/editor_settings.h"
#include "editor/themes/editor_scale.h" #include "editor/themes/editor_scale.h"
#include "scene/gui/item_list.h" #include "scene/gui/item_list.h"
@@ -60,7 +58,7 @@ void EditorLayoutsDialog::_update_ok_disable_state() {
if (layout_names->is_anything_selected()) { if (layout_names->is_anything_selected()) {
get_ok_button()->set_disabled(false); get_ok_button()->set_disabled(false);
} else { } else {
get_ok_button()->set_disabled(!name->is_visible() || name->get_text().is_empty()); get_ok_button()->set_disabled(!name->is_visible() || name->get_text().strip_edges().is_empty());
} }
} }
@@ -80,8 +78,8 @@ void EditorLayoutsDialog::ok_pressed() {
for (int i = 0; i < selected_items.size(); ++i) { for (int i = 0; i < selected_items.size(); ++i) {
emit_signal(SNAME("name_confirmed"), layout_names->get_item_text(selected_items[i])); emit_signal(SNAME("name_confirmed"), layout_names->get_item_text(selected_items[i]));
} }
} else if (name->is_visible() && !name->get_text().is_empty()) { } else if (name->is_visible() && !name->get_text().strip_edges().is_empty()) {
emit_signal(SNAME("name_confirmed"), name->get_text()); emit_signal(SNAME("name_confirmed"), name->get_text().strip_edges());
} }
} }

4
editor/editor_node.cpp
View File

@@ -2136,10 +2136,6 @@ void EditorNode::_dialog_action(String p_file) {
} break; } break;
case SETTINGS_LAYOUT_DELETE: { case SETTINGS_LAYOUT_DELETE: {
if (p_file.is_empty()) {
return;
}
Ref<ConfigFile> config; Ref<ConfigFile> config;
config.instantiate(); config.instantiate();
Error err = config->load(EditorSettings::get_singleton()->get_editor_layouts_config()); Error err = config->load(EditorSettings::get_singleton()->get_editor_layouts_config());