mirrors/doublecmd
2
0
Fork 0
mirror of https://github.com/doublecmd/doublecmd.git synced 2026-06-28 10:02:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

FIX: Don't lose the cursor if current file is renamed or last file is deleted.

Browse source
This commit is contained in:
cobines 2012-03-18 17:35:54 +00:00
commit 945847a149
2 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/newdesign/ucolumnsfileviewvtv.pas
View file

@ -141,7 +141,6 @@ type
FColumnsSorting: TColumnsSortings;
FFileNameColumn: Integer;
FExtensionColumn: Integer;
FLastActiveNode: PVirtualNode; //<en Last active node
FLastActiveRow: Integer;
FUpdatingGrid: Boolean;
FLastSelectionStartRow: Integer;
@ -971,9 +970,8 @@ var
begin
dgPanel.TreeOptions.AutoOptions := dgPanel.TreeOptions.AutoOptions - [toDisableAutoscrollOnFocus];
if (FLastActiveNode <> Node) and (not FUpdatingGrid) then
if Assigned(Node) and (FLastActiveRow <> Node^.Index) and (not FUpdatingGrid) then
begin
FLastActiveNode:= Node;
FLastActiveRow := Node^.Index;
if Assigned(Node) then
@ -2574,7 +2572,15 @@ begin
// Requested file was not found, restore position to last active file.
if not SetActiveFileNow(LastActiveFile) then
begin
if FLastActiveRow >= 0 then
if FLastActiveRow >= dgPanel.RootNodeCount then
begin
FUpdatingGrid := True;
dgPanel.FocusedNode := dgPanel.GetLastNoInit;
FUpdatingGrid := False;
SetLastActiveFile(FLastActiveRow);
AFocused := True;
end
else if FLastActiveRow >= 0 then
begin
Node := dgPanel.GetFirstNoInit;
while Assigned(Node) do

2
src/newdesign/ufileview.pas
View file

@ -866,6 +866,8 @@ begin
begin
if not bFilter then
begin
if GetActiveDisplayFile = ADisplayFile then
RequestedActiveFile := ADisplayFile.FSFile.FullPath;
ResortFile(ADisplayFile, FFiles);
VisualizeFileUpdate(ADisplayFile);
end