Skip to content

Commit

Permalink
Merge pull request #90783 from bruvzg/mac_fd_no_filter
Browse files Browse the repository at this point in the history
[macOS] Fix native file dialog with empty filter list.
  • Loading branch information
akien-mga committed Apr 17, 2024
2 parents 2d26202 + e667dc2 commit 4b7776e
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions platform/macos/godot_open_save_delegate.mm
Original file line number Diff line number Diff line change
Expand Up @@ -177,14 +177,14 @@ - (void)makeAccessoryView:(NSSavePanel *)p_panel filters:(const Vector<String> &
if ([new_allowed_types count] > 0) {
NSMutableArray *type_filters = [new_allowed_types objectAtIndex:0];
if (type_filters && [type_filters count] == 1 && [[type_filters objectAtIndex:0] isEqualToString:@"*"]) {
[p_panel setAllowedFileTypes:@[]];
[p_panel setAllowedFileTypes:nil];
[p_panel setAllowsOtherFileTypes:true];
} else {
[p_panel setAllowsOtherFileTypes:false];
[p_panel setAllowedFileTypes:type_filters];
}
} else {
[p_panel setAllowedFileTypes:@[]];
[p_panel setAllowedFileTypes:nil];
[p_panel setAllowsOtherFileTypes:true];
}
}
Expand Down Expand Up @@ -248,15 +248,15 @@ - (void)popupFileAction:(id)p_sender {
if (allowed_types && index < [allowed_types count]) {
NSMutableArray *type_filters = [allowed_types objectAtIndex:index];
if (type_filters && [type_filters count] == 1 && [[type_filters objectAtIndex:0] isEqualToString:@"*"]) {
[dialog setAllowedFileTypes:@[]];
[dialog setAllowedFileTypes:nil];
[dialog setAllowsOtherFileTypes:true];
} else {
[dialog setAllowsOtherFileTypes:false];
[dialog setAllowedFileTypes:type_filters];
}
cur_index = index;
} else {
[dialog setAllowedFileTypes:@[]];
[dialog setAllowedFileTypes:nil];
[dialog setAllowsOtherFileTypes:true];
cur_index = -1;
}
Expand Down

0 comments on commit 4b7776e

Please sign in to comment.