Merge branch 'feature/51-reverse-compiler-list-order' into develop

Fixes #51

Author: delphidabbler

Src/Compilers.USettings.pas

@@ -27,8 +27,6 @@   TCompilerSettings = class(TNoConstructObject)
     const
       AllCompilersConfigSection = ssCompilers;
       PermitStartupDetectionKey = 'PermitStartupDetection';
-      ListFPCAtTopKey = 'Lists:FPCAtTop';
-      ListDelphiOldestFirstKey = 'Lists:DelphiOldestFirst';
     class function ReadStorage: ISettingsSection;
     class procedure DoSaveProperty(const WriteProp: TProc<ISettingsSection>);
     class procedure SaveProperty(const Key: string; const Value: Boolean);

Src/FmCompilersDlg.UCompilerListMgr.pas

@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2011-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2011-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a class that manages display of compiler names in an owner draw
  * list box.
@@ -34,6 +34,8 @@   TCompilerListMgr = class(TObject)
     ///  <summary>Reference to managed list box.</summary>
     ///  <remarks>Must be owner draw.</remarks>
     fLB: TListBox;
+    fMapIdxToComp: TArray<TCompilerID>;
+    fMapCompToIdx: array[TCompilerID] of Integer;
     ///  <summary>List of compilers to be displayed in list box.</summary>
     fCompilers: ICompilers;
     ///  <summary>Reference to OnSelect event handler.</summary>
@@ -87,11 +89,16 @@ implementation
 
 constructor TCompilerListMgr.Create(const LB: TListBox;
   const Compilers: ICompilers);
+var
+  CompID: TCompilerID;
 begin
   inherited Create;
   fLB := LB;
   fLB.OnClick := LBClickHandler;
   fLB.OnDrawItem := LBDrawItemHandler;
+  fLB.Clear;
+  for CompID := Low(TCompilerID) to High(TCompilerID) do
+    fLB.Items.Add('');
   fCompilers := Compilers;
 end;
 
@@ -103,19 +110,27 @@ procedure TCompilerListMgr.DoSelect;
 
 function TCompilerListMgr.GetSelected: ICompiler;
 begin
-  Result := fCompilers[TCompilerID(fLB.ItemIndex)];
+  Result := fCompilers[fMapIdxToComp[fLB.ItemIndex]];
 end;
 
 procedure TCompilerListMgr.Initialise;
 var
   CompID: TCompilerID;  // loops thru supported compilers
+  Idx: Integer;
 begin
   inherited;
+
   // Add empty list items - one per supported compiler. Note we don't need item
   // text since we handle drawing of list items ourselves and get details from
   // compiler objects.
+  SetLength(fMapIdxToComp, Length(fMapCompToIdx));
+  Idx := High(fMapIdxToComp);
   for CompID := Low(TCompilerID) to High(TCompilerID) do
-    fLB.Items.Add('');
+  begin
+    fMapIdxToComp[Idx] := CompID;
+    fMapCompToIdx[CompID] := Idx;
+    Dec(Idx);
+  end;
   // Select first compiler in list and trigger selection event for it
   fLB.ItemIndex := 0;
   DoSelect;
@@ -139,7 +154,7 @@ procedure TCompilerListMgr.LBDrawItemHandler(Control: TWinControl;
   ItemRect := Rect;
 
   // Compiler object associated with list item
-  Compiler := fCompilers[TCompilerID(Index)];
+  Compiler := fCompilers[fMapIdxToComp[Index]];
 
   // Use bold font if compiler available
   if Compiler.IsAvailable then
@@ -208,7 +223,7 @@ procedure TCompilerListMgr.Refresh(Compiler: ICompiler);
 var
   InvalidRect: TRectEx;
 begin
-  InvalidRect := fLB.ItemRect(Ord(Compiler.GetID));
+  InvalidRect := fLB.ItemRect(fMapCompToIdx[Compiler.GetID]);
   InvalidateRect(fLB.Handle, @InvalidRect, False);
 end;
 

Src/FmFindCompilerDlg.pas

@@ -55,6 +55,7 @@   TFindCompilerDlg = class(TGenericOKDlg, INoPublicConstruct)
     fSearchParams: TCompilerSearchParams; // Persistent compiler search options
     fSearch: ISearch;                     // Search entered by user
     fRefinePreviousSearch: Boolean;       // Whether to refine previous search
+    fMapIdxToComp: TArray<TCompilerID>;   // Maps list idx to comp ID of entry
 
     procedure UpdateOKBtn;
       {Updates state of OK button according to whether valid entries made in
@@ -363,13 +364,25 @@ procedure TFindCompilerDlg.InitForm;
   Option: TCompilerSearchOption;  // loops thru possible compiler search options
   SelOption: Integer;             // selected search option
   Compiler: ICompiler;            // references each compiler
+  CompID: TCompilerID;
 begin
   inherited;
+  // Set up index map that reverses order of compilers
+  SetLength(fMapIdxToComp, fCompilers.Count);
+  Idx := High(fMapIdxToComp);
+  for CompID := Low(TCompilerID) to High(TCompilerID) do
+  begin
+    fMapIdxToComp[Idx] := CompID;
+    Dec(Idx);
+  end;
+
   // Set up list of compilers and check appropriate ones
   // we store compiler ID in listbox's Objects[] property
-  for Compiler in fCompilers do
+  // Use mapping to reverse order of compilers in list
+  for Idx := Low(fMapIdxToComp) to High(fMapIdxToComp) do
   begin
-    Idx := lbCompilerVers.Items.AddObject(
+    Compiler := fCompilers[fMapIdxToComp[Idx]];
+    lbCompilerVers.Items.AddObject(
       Compiler.GetName, TObject(Compiler.GetID)
     );
     lbCompilerVers.Checked[Idx] := Compiler.GetID in fSearchParams.Compilers;