paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-07 02:58:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

cocoa: fix the filter index selection

Browse Source 
(cherry picked from commit 8629f0f2b126d7137559d7273258a7c28c7a6bac)
This commit is contained in:
Dmitry Boyarintsev 2021-10-17 22:23:49 -04:00 committed by Maxim Ganetsky
parent fea136a894
commit 4aaf8d270c
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lcl/interfaces/cocoa/cocoawsdialogs.pas
View File

@ -130,7 +130,7 @@ type
NSFilters: NSMutableArray;
lastSelectedItemIndex: Integer; // -1 means invalid or none selected
procedure updateFilterList(); message 'updateFilterList';
procedure setDialogFilter(ASelectedFilterIndex: Integer); message 'setDialogFilter:';
function setDialogFilter(ASelectedFilterIndex: Integer): Integer; message 'setDialogFilter:';
procedure comboboxAction(sender: id); message 'comboboxAction:';
// NSOpenSavePanelDelegateProtocol
function panel_shouldEnableURL(sender: id; url: NSURL): LCLObjCBoolean; message 'panel:shouldEnableURL:';
@ -351,7 +351,7 @@ var
lFilter.lastSelectedItemIndex := 0
else
lFilter.lastSelectedItemIndex := FileDialog.FilterIndex-1;
lFilter.setDialogFilter(lFilter.lastSelectedItemIndex);
lFilter.lastSelectedItemIndex := lFilter.setDialogFilter(lFilter.lastSelectedItemIndex);
lFilter.sizeToFit;
lFilter.setAutoresizingMask(NSViewWidthSizable);
if FileDialog.FilterIndex>0 then
@ -868,7 +868,7 @@ begin
end;
// Generates NSFilters from Filters, for the currently selected combobox index
procedure TCocoaFilterComboBox.setDialogFilter(ASelectedFilterIndex: Integer);
function TCocoaFilterComboBox.setDialogFilter(ASelectedFilterIndex: Integer): Integer;
var
lCurFilter: TStringList;
ns: NSString;
@ -878,9 +878,16 @@ var
ext : string;
j : integer;
begin
if Filters = nil then Exit;
if (Filters = nil) or (Filters.Count=0) then
begin
Result := -1;
Exit;
end;
if CocoaUseUTIFilter then
begin
if (ASelectedFilterIndex < 0) or (ASelectedFilterIndex >= Filters.Count) then
ASelectedFilterIndex := 0;
Result := ASelectedFilterIndex;
lCurFilter := TStringList(Filters.Objects[ASelectedFilterIndex]);
NSFilters := NSMutableArray.alloc.init;
for i:=0 to lCurFilter.Count-1 do
@ -938,7 +945,9 @@ begin
NSFilters.addObject(ns);
ns.release;
end;
end;
Result := ASelectedFilterIndex;
end else
Result := -1;
DialogHandle.validateVisibleColumns();
// work around for bug in validateVisibleColumns() in Mavericks till 10.10.2