summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2019-12-07 10:33:45 +0100
committerGitHub <noreply@github.com>2019-12-07 10:33:45 +0100
commit8eb183aebb9c79ff92d6f566af7ad2f91696ce08 (patch)
tree7c7f36a99c99bf5cc42c79d3019bcb01a13bf2d3
parentff58030ed693b6915ea7b378b0483b65547d5f8b (diff)
parentd057007541abab751ad956a44139be206acb8128 (diff)
Merge pull request #34167 from YeldhamDev/filediag_comma_spaces_strip
Add spaces after commas and strip extra ones in *FileDialog filter menu
-rw-r--r--editor/editor_file_dialog.cpp4
-rw-r--r--scene/gui/file_dialog.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/editor/editor_file_dialog.cpp b/editor/editor_file_dialog.cpp
index ea01f127b3..7fc989b5e9 100644
--- a/editor/editor_file_dialog.cpp
+++ b/editor/editor_file_dialog.cpp
@@ -907,9 +907,9 @@ void EditorFileDialog::update_filters() {
const int max_filters = 5;
for (int i = 0; i < MIN(max_filters, filters.size()); i++) {
- String flt = filters[i].get_slice(";", 0);
+ String flt = filters[i].get_slice(";", 0).strip_edges();
if (i > 0)
- all_filters += ",";
+ all_filters += ", ";
all_filters += flt;
}
diff --git a/scene/gui/file_dialog.cpp b/scene/gui/file_dialog.cpp
index a76e99f304..dd9e11508f 100644
--- a/scene/gui/file_dialog.cpp
+++ b/scene/gui/file_dialog.cpp
@@ -558,9 +558,9 @@ void FileDialog::update_filters() {
const int max_filters = 5;
for (int i = 0; i < MIN(max_filters, filters.size()); i++) {
- String flt = filters[i].get_slice(";", 0);
+ String flt = filters[i].get_slice(";", 0).strip_edges();
if (i > 0)
- all_filters += ",";
+ all_filters += ", ";
all_filters += flt;
}