From 484c08b2ed36f71f22c7c1d20d38fd22d21ccad0 Mon Sep 17 00:00:00 2001
From: Jochen Neubeck <jochen.neubeck@quintec.de>
Date: Sun, 25 Feb 2024 09:28:34 +0100
Subject: [PATCH] Fix #1887 - Data grid surprisingly resets horizontal scroll
 position

---
 source/main.pas | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/source/main.pas b/source/main.pas
index f2761cac..afd3fdeb 100644
--- a/source/main.pas
+++ b/source/main.pas
@@ -6090,12 +6090,6 @@ begin
 
     DataGridFocusedNodeIndex := Min(DataGridFocusedNodeIndex, Int64(vt.RootNodeCount)-1);
     SelectNode(vt, DataGridFocusedNodeIndex);
-    for i:=0 to vt.Header.Columns.Count-1 do begin
-      if vt.Header.Columns[i].Text = DataGridFocusedColumnName then begin
-        vt.FocusedColumn := i;
-        break;
-      end;
-    end;
     if RefreshingData then begin
 
       if (FDataGridLastClickedColumnHeader >= 0) and (FDataGridLastClickedColumnHeader < vt.Header.Columns.Count) then begin // See issue #3309
@@ -6108,6 +6102,12 @@ begin
 
       vt.OffsetXY := OldScrollOffset;
     end;
+    for i:=0 to vt.Header.Columns.Count-1 do begin
+      if vt.Header.Columns[i].Text = DataGridFocusedColumnName then begin
+        vt.FocusedColumn := i;
+        break;
+      end;
+    end;
 
     // Reset remembered data for last clicked column header
     FDataGridLastClickedColumnHeader := NoColumn;