fix: auto fit columns in search-on-server results, taking the header caption into account

ansgarbecker · ansgarbecker · commit 4ce827b3583a · 2026-01-19T11:48:54.000+01:00
diff --git a/source/lazaruscompat.pas b/source/lazaruscompat.pas
@@ -5,7 +5,8 @@
 interface
 
 uses
-  Classes, SysUtils, SynEdit, SynEditKeyCmds, SynEditHighlighter, laz.VirtualTrees;
+  Classes, SysUtils, SynEdit, SynEditKeyCmds, SynEditHighlighter, laz.VirtualTrees,
+  Graphics;
 
 type
 
@@ -27,6 +28,12 @@   TSynHighlighterAttributesHelper = class helper for TSynHighlighterAttributes
       procedure AssignColorAndStyle(Source: TSynHighlighterAttributes);
   end;
 
+  TVTHeaderHelper = class helper for TVTHeader
+    public
+      // AutoFitColumns version which takes the header caption into account
+      procedure AutoFitColumnsWithHeaderMin;
+  end;
+
   TStringsHelper = class helper for TStrings
     public
       function Contains(const S: String): Boolean;
@@ -218,6 +225,27 @@ procedure TSynHighlighterAttributesHelper.AssignColorAndStyle(Source: TSynHighli
     Changed;
 end;
 
+procedure TVTHeaderHelper.AutoFitColumnsWithHeaderMin;
+var
+  cnv: TCanvas;
+  c: Integer;
+  CapWidth: Integer;
+  ws: String;
+  ExtraPad: Integer;
+begin
+  cnv := Treeview.Canvas;
+  ExtraPad := 5;
+  for c:=0 to Columns.Count - 1 do begin
+    ws := Columns[c].Text;
+    if ws <> '' then begin
+      CapWidth := cnv.TextWidth(ws);
+      Columns[c].MinWidth := CapWidth + (Columns[c].Margin * 2) + ExtraPad;
+    end;
+  end;
+  // now let VST auto-fit using node content, but not below header-based MinWidth
+  AutoFitColumns(False);
+end;
+
 function TStringsHelper.Contains(const S: String): Boolean;
 begin
   Result := IndexOf(S) >= 0;
diff --git a/source/tabletools.pas b/source/tabletools.pas
@@ -1454,7 +1454,7 @@ procedure TfrmTableTools.UpdateResultGrid;
     f_('%s%% done', [FormatNumber(Percent, 1)]) + '.';
   MainForm.SetProgressPosition(Round(Percent));
   MainForm.ShowStatusMsg(Format(StatusMsg, [tabsTools.ActivePage.Caption, FormatTimeNumber((GetTickCount64-FStartTimeAll)/1000, True)]));
-  ResultGrid.Header.AutoFitColumns(False);
+  ResultGrid.Header.AutoFitColumnsWithHeaderMin;
   Application.ProcessMessages;
 end;
 
