Skip to content

Commit f835707

Browse files
committed
Fix Windows native FileDialog filters not showing descriptions
1 parent cb7cd81 commit f835707

File tree

2 files changed

+12
-11
lines changed

2 files changed

+12
-11
lines changed

platform/windows/display_server_windows.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -555,7 +555,7 @@ void DisplayServerWindows::_thread_fd_monitor(void *p_ud) {
555555
if (!exts.is_empty()) {
556556
String str = String(";").join(exts);
557557
filter_exts.push_back(str.utf16());
558-
if (tokens.size() == 2) {
558+
if (tokens.size() >= 2) {
559559
filter_names.push_back(tokens[1].strip_edges().utf16());
560560
} else {
561561
filter_names.push_back(str.utf16());

scene/gui/file_dialog.cpp

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1162,13 +1162,13 @@ void FileDialog::update_filters() {
11621162
}
11631163

11641164
String native_all_name;
1165+
native_all_name += all_filters;
11651166
if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_NATIVE_DIALOG_FILE_MIME)) {
1166-
native_all_name += all_filters;
1167-
}
1168-
if (!native_all_name.is_empty()) {
1169-
native_all_name += ", ";
1167+
if (!native_all_name.is_empty()) {
1168+
native_all_name += ", ";
1169+
}
1170+
native_all_name += all_mime;
11701171
}
1171-
native_all_name += all_mime;
11721172

11731173
if (max_filters < filters.size()) {
11741174
all_filters += ", ...";
@@ -1183,13 +1183,14 @@ void FileDialog::update_filters() {
11831183
String desc = filters[i].get_slicec(';', 1).strip_edges();
11841184
String mime = filters[i].get_slicec(';', 2).strip_edges();
11851185
String native_name;
1186+
1187+
native_name += flt;
11861188
if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_NATIVE_DIALOG_FILE_MIME)) {
1187-
native_name += flt;
1188-
}
1189-
if (!native_name.is_empty() && !mime.is_empty()) {
1190-
native_name += ", ";
1189+
if (!native_name.is_empty() && !mime.is_empty()) {
1190+
native_name += ", ";
1191+
}
1192+
native_name += mime;
11911193
}
1192-
native_name += mime;
11931194
if (!desc.is_empty()) {
11941195
filter->add_item(atr(desc) + " (" + flt + ")");
11951196
processed_filters.push_back(flt + ";" + atr(desc) + " (" + native_name + ");" + mime);

0 commit comments

Comments
 (0)