From 9d37265fe79ca7aed52f9832404358aa2ff50c89 Mon Sep 17 00:00:00 2001 From: Whiletru3 Date: Thu, 12 Jun 2025 01:48:17 +0200 Subject: [PATCH] Fix for #19035 On macOS, the SuggestedStartLocation is not set if the FileTypeChoices Is not null (#19036) --- .../src/OSX/StorageProvider.mm | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/native/Avalonia.Native/src/OSX/StorageProvider.mm b/native/Avalonia.Native/src/OSX/StorageProvider.mm index abf7f85c5f..92278a85e9 100644 --- a/native/Avalonia.Native/src/OSX/StorageProvider.mm +++ b/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) {