7cc5c4f330d47060/geode
1
0
Fork 0
mirror of https://github.com/geode-sdk/geode.git synced 2024-11-14 19:15:05 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

fix file api crash on macos

Browse source
This commit is contained in:
qimiko 2024-01-28 06:27:10 -07:00
parent f307263e5f
commit 2e860309a1
No known key found for this signature in database
GPG key ID: D2D404DD810FE0E3
1 changed files with 34 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
loader/src/platform/mac/util.mm
View file

@ -65,13 +65,18 @@ void utils::web::openLinkInBrowser(std::string const& url) {
@end*/
namespace {
using FileResult = Result<std::vector<ghc::filesystem::path>>;
}
@interface FileDialog : NSObject
+(void) filePickerWithMode:(file::PickMode)mode options:(file::FilePickOptions const&)options multiple:(bool)mult onCompletion:(void(^)(FileResult))onCompletion;
+(void) dispatchFilePickerWithMode:(file::PickMode)mode options:(file::FilePickOptions const&)options multiple:(bool)mult onCompletion:(void(^)(FileResult))onCompletion;
+(Result<std::vector<ghc::filesystem::path>>) filePickerWithMode:(file::PickMode)mode options:(file::FilePickOptions const&)options multiple:(bool)mult;
@end
@implementation FileDialog
+(Result<std::vector<ghc::filesystem::path>>) filePickerWithMode:(file::PickMode)mode options:(file::FilePickOptions const&)options multiple:(bool)mult {
+(void) filePickerWithMode:(file::PickMode)mode options:(file::FilePickOptions const&)options multiple:(bool)mult onCompletion:(void(^)(FileResult))onCompletion {
NSSavePanel* panel;
if (mode == file::PickMode::SaveFile)
panel = [NSSavePanel savePanel];
@ -135,11 +140,23 @@ void utils::web::openLinkInBrowser(std::string const& url) {
fileURLs.push_back(std::string(i.path.UTF8String));
}
}
return Ok(fileURLs);
return onCompletion(Ok(fileURLs));
} else {
return Err("File picker cancelled");
return onCompletion(Err("File picker cancelled"));
}
}
+(void) dispatchFilePickerWithMode:(file::PickMode)mode options:(file::FilePickOptions const&)options multiple:(bool)mult onCompletion:(void(^)(FileResult))onCompletion {
dispatch_async(dispatch_get_main_queue(), ^{
[self filePickerWithMode:mode options:options multiple:mult onCompletion:onCompletion];
});
}
+(Result<std::vector<ghc::filesystem::path>>) filePickerWithMode:(file::PickMode)mode options:(file::FilePickOptions const&)options multiple:(bool)mult {
return Err("Use the callback version");
}
@end
Result<ghc::filesystem::path> file::pickFile(
@ -159,13 +176,13 @@ GEODE_DLL void file::pickFile(
MiniFunction<void(ghc::filesystem::path)> callback,
MiniFunction<void()> failed
) {
auto result = file::pickFile(mode, options);
if (result.isOk()) {
callback(std::move(result.unwrap()));
} else {
failed();
}
[FileDialog dispatchFilePickerWithMode:mode options:options multiple:false onCompletion: ^(FileResult result) {
if (result.isOk()) {
callback(std::move(result.unwrap()[0]));
} else {
failed();
}
}];
}
Result<std::vector<ghc::filesystem::path>> file::pickFiles(
@ -180,13 +197,13 @@ GEODE_DLL void file::pickFiles(
MiniFunction<void(std::vector<ghc::filesystem::path>)> callback,
MiniFunction<void()> failed
) {
auto result = file::pickFiles(options);
if (result.isOk()) {
callback(std::move(result.unwrap()));
} else {
failed();
}
[FileDialog dispatchFilePickerWithMode: file::PickMode::OpenFile options:options multiple:true onCompletion: ^(FileResult result) {
if (result.isOk()) {
callback(std::move(result.unwrap()));
} else {
failed();
}
}];
}
CCPoint cocos::getMousePos() {