fix: work around out-of-view item in left tree after FormShow

ansgarbecker · ansgarbecker · commit ec4c237caecf · 2025-11-28T15:24:03.000+01:00
Also, remove error dialog when InitialDir is an invalid path. Climb up path until it's valid. Refs #2268
diff --git a/source/extfiledialog.lfm b/source/extfiledialog.lfm
@@ -174,9 +174,8 @@ object frmExtFileDialog: TfrmExtFileDialog
     Align = alLeft
     BorderSpacing.Left = 10
     HideSelection = False
-    ReadOnly = False
     TabOrder = 0
-    Options = [tvoAutoItemHeight, tvoKeepCollapsedNodes, tvoShowButtons, tvoShowLines, tvoShowRoot, tvoToolTips, tvoThemedDraw]
+    Options = [tvoAutoItemHeight, tvoKeepCollapsedNodes, tvoReadOnly, tvoShowButtons, tvoShowLines, tvoShowRoot, tvoToolTips, tvoThemedDraw]
     ObjectTypes = [otFolders, otHidden]
     ShellListView = ShellListView
     OnChange = ShellTreeViewChange
@@ -200,6 +199,7 @@ object frmExtFileDialog: TfrmExtFileDialog
     Color = clDefault
     SortType = stText
     TabOrder = 1
+    ObjectTypes = [otNonFolders, otHidden]
     ShellTreeView = ShellTreeView
     OnClick = ShellListViewClick
     OnDblClick = ShellListViewDblClick
@@ -220,4 +220,11 @@ object frmExtFileDialog: TfrmExtFileDialog
     OnMouseDown = lblPathMouseDown
     OnMouseMove = lblPathMouseMove
   end
+  object IdleTimerTreeNodeScrolltoview: TIdleTimer
+    AutoEnabled = True
+    Interval = 100
+    OnTimer = IdleTimerTreeNodeScrolltoviewTimer
+    Left = 32
+    Top = 64
+  end
 end
diff --git a/source/extfiledialog.pas b/source/extfiledialog.pas
@@ -19,6 +19,7 @@   TfrmExtFileDialog = class(TExtForm)
     comboEncoding: TComboBox;
     comboFileType: TComboBox;
     editFilename: TEdit;
+    IdleTimerTreeNodeScrolltoview: TIdleTimer;
     lblPath: TLabel;
     lblLinebreaks: TLabel;
     lblEncoding: TLabel;
@@ -34,6 +35,7 @@   TfrmExtFileDialog = class(TExtForm)
     procedure FormCreate(Sender: TObject);
     procedure FormDestroy(Sender: TObject);
     procedure FormShow(Sender: TObject);
+    procedure IdleTimerTreeNodeScrolltoviewTimer(Sender: TObject);
     procedure lblPathClick(Sender: TObject);
     procedure lblPathMouseDown(Sender: TObject; Button: TMouseButton;
       Shift: TShiftState; X, Y: Integer);
@@ -163,6 +165,17 @@ procedure TfrmExtFileDialog.FormShow(Sender: TObject);
     comboLineBreaks.ItemIndex := LineBreakIndexInt;
 end;
 
+procedure TfrmExtFileDialog.IdleTimerTreeNodeScrolltoviewTimer(Sender: TObject);
+begin
+  // Work around tree node not being in scroll area in the first place
+  if not Visible then
+    Exit;
+  if Assigned(ShellTreeView.Selected) then
+    ShellTreeView.Selected.MakeVisible;
+  IdleTimerTreeNodeScrolltoview.AutoEnabled := False;
+  IdleTimerTreeNodeScrolltoview.Enabled := False;
+end;
+
 procedure TfrmExtFileDialog.lblPathClick(Sender: TObject);
 begin
   if (not FClickedPathPart.IsEmpty) and DirectoryExists(FClickedPathPart) then begin
@@ -200,6 +213,7 @@ function TfrmExtFileDialog.GetPathPartAt(X: Integer): String;
     Inc(CurrentWidth, TextWidth);
   end;
   if CharIndex > 0 then begin
+    i := 0;
     for i:=CharIndex to Length(lblPath.Caption) do begin
       if Copy(lblPath.Caption, i, 1) = PathDelim then
         break;
@@ -330,15 +344,25 @@ procedure TfrmExtFileDialog.SetFileName(const AValue: String);
 end;
 
 procedure TfrmExtFileDialog.SetInitialDir(const AValue: String);
+var
+  CurPath: String;
+  i: Integer;
 begin
+  // Try to set path on tree
   FInitialDir := AValue;
-  try
-    ShellTreeView.Path := FInitialDir;
-  except
-    on E:EInvalidPath do begin
-      ErrorDialog(E.Message);
-      // In case, re-enable changing directory in tree
-      Exclude(FOptions, ofNoChangeDir);
+  CurPath := AValue;
+  for i:=0 to 10 do begin
+    try
+      ShellTreeView.Path := CurPath;
+      Break;
+    except
+      on E:EInvalidPath do begin
+        // Go up to parent folder
+        // Testable on connections > advanced > file logging, due to virtual template strings.
+        CurPath := ExtractFilePath(ExcludeTrailingPathDelimiter(CurPath));
+        // In case, re-enable changing directory in tree
+        Exclude(FOptions, ofNoChangeDir);
+      end;
     end;
   end;
 end;
