Browse Source

Fix for #19035 On macOS, the SuggestedStartLocation is not set if the FileTypeChoices Is not null (#19036)

release/11.3.2
Whiletru3 8 months ago
committed by Julien Lebosquain
parent
commit
9d37265fe7
  1. 22
      native/Avalonia.Native/src/OSX/StorageProvider.mm

22
native/Avalonia.Native/src/OSX/StorageProvider.mm

@ -235,11 +235,6 @@ public:
panel.title = [NSString stringWithUTF8String:title];
}
if(initialDirectory != nullptr)
{
auto directoryString = [NSString stringWithUTF8String:initialDirectory];
panel.directoryURL = [NSURL URLWithString:directoryString];
}
if(initialFile != nullptr)
{
@ -248,6 +243,12 @@ public:
SetAccessoryView(panel, filters, false);
if(initialDirectory != nullptr)
{
auto directoryString = [NSString stringWithUTF8String:initialDirectory];
panel.directoryURL = [NSURL URLWithString:directoryString];
}
auto handler = ^(NSModalResponse result) {
if(result == NSFileHandlingPanelOKButton)
{
@ -304,11 +305,6 @@ public:
panel.title = [NSString stringWithUTF8String:title];
}
if(initialDirectory != nullptr)
{
auto directoryString = [NSString stringWithUTF8String:initialDirectory];
panel.directoryURL = [NSURL URLWithString:directoryString];
}
if(initialFile != nullptr)
{
@ -317,6 +313,12 @@ public:
SetAccessoryView(panel, filters, true);
if(initialDirectory != nullptr)
{
auto directoryString = [NSString stringWithUTF8String:initialDirectory];
panel.directoryURL = [NSURL URLWithString:directoryString];
}
auto handler = ^(NSModalResponse result) {
if(result == NSFileHandlingPanelOKButton)
{

Loading…
Cancel
Save