mirrors/doublecmd
2
0
Fork 0
mirror of https://github.com/doublecmd/doublecmd.git synced 2026-06-21 09:58:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

FIX: Differ - text mode modal dialog

Browse source 
(cherry picked from commit 71725d1bd0)
This commit is contained in:
Alexander Koblov 2024-02-20 19:45:39 +03:00
commit 4079e78672
1 changed files with 55 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

109
src/fdiffer.pas
View file

@ -365,58 +365,71 @@ begin
BinaryCompare.Start;
end;
end
else try
else begin
Inc(ScrollLock);
Screen.BeginWaitCursor;
try
if SynDiffEditLeft.Modified then SynDiffEditLeft.Lines.RemoveFake;
if SynDiffEditRight.Modified then SynDiffEditRight.Lines.RemoveFake;
BuildHashList(SynDiffEditLeft.Modified, SynDiffEditRight.Modified);
if SynDiffEditLeft.Modified then SynDiffEditLeft.Lines.RemoveFake;
if SynDiffEditRight.Modified then SynDiffEditRight.Lines.RemoveFake;
BuildHashList(SynDiffEditLeft.Modified, SynDiffEditRight.Modified);
if (Length(HashListLeft) = 0) or (Length(HashListRight) = 0) then
begin
FCancel := True;
Exit;
end;
if (Length(HashListLeft) = 0) or (Length(HashListRight) = 0) then
begin
FCancel := True;
Exit;
end;
actStartCompare.Enabled := False;
actCancelCompare.Enabled := True;
actStartCompare.Enabled := False;
actCancelCompare.Enabled := True;
Diff.Execute(
PInteger(@HashListLeft[0]),
PInteger(@HashListRight[0]),
Length(HashListLeft),
Length(HashListRight)
);
Diff.Execute(
PInteger(@HashListLeft[0]),
PInteger(@HashListRight[0]),
Length(HashListLeft),
Length(HashListRight)
);
tmProgress.Enabled:= False;
if Diff.Cancelled then Exit;
tmProgress.Enabled:= False;
if Diff.Cancelled then Exit;
SynDiffEditLeft.StartCompare;
SynDiffEditRight.StartCompare;
SynDiffEditLeft.StartCompare;
SynDiffEditRight.StartCompare;
for I := 0 to Diff.Count - 1 do
with Diff.Compares[I] do
begin
LineNumberLeft:= oldIndex1 + 1;
LineNumberRight:= oldIndex2 + 1;
case Kind of
ckAdd:
begin
SynDiffEditLeft.Lines.InsertFake(I, Kind);
SynDiffEditRight.Lines.SetKindAndNumber(I, Kind, LineNumberRight);
end;
ckDelete:
begin
SynDiffEditLeft.Lines.SetKindAndNumber(I, Kind, LineNumberLeft);
SynDiffEditRight.Lines.InsertFake(I, Kind);
end;
else
begin
SynDiffEditLeft.Lines.SetKindAndNumber(I, Kind, LineNumberLeft);
SynDiffEditRight.Lines.SetKindAndNumber(I, Kind, LineNumberRight);
for I := 0 to Diff.Count - 1 do
with Diff.Compares[I] do
begin
LineNumberLeft:= oldIndex1 + 1;
LineNumberRight:= oldIndex2 + 1;
case Kind of
ckAdd:
begin
SynDiffEditLeft.Lines.InsertFake(I, Kind);
SynDiffEditRight.Lines.SetKindAndNumber(I, Kind, LineNumberRight);
end;
ckDelete:
begin
SynDiffEditLeft.Lines.SetKindAndNumber(I, Kind, LineNumberLeft);
SynDiffEditRight.Lines.InsertFake(I, Kind);
end;
else
begin
SynDiffEditLeft.Lines.SetKindAndNumber(I, Kind, LineNumberLeft);
SynDiffEditRight.Lines.SetKindAndNumber(I, Kind, LineNumberRight);
end;
end;
end;
finally
SynDiffEditLeft.FinishCompare;
SynDiffEditRight.FinishCompare;
actStartCompare.Enabled := True;
actCancelCompare.Enabled := False;
Screen.EndWaitCursor;
Dec(ScrollLock);
end;
if actLineDifferences.Checked then
begin
SynDiffEditLeft.Highlighter:= SynDiffHighlighterLeft;
SynDiffEditRight.Highlighter:= SynDiffHighlighterRight;
end;
with Diff.DiffStats do
begin
@ -445,18 +458,6 @@ begin
end;
end;
end;
finally
SynDiffEditLeft.FinishCompare;
SynDiffEditRight.FinishCompare;
actStartCompare.Enabled := True;
actCancelCompare.Enabled := False;
Screen.EndWaitCursor;
Dec(ScrollLock);
end;
if actLineDifferences.Checked then
begin
SynDiffEditLeft.Highlighter:= SynDiffHighlighterLeft;
SynDiffEditRight.Highlighter:= SynDiffHighlighterRight;
end;
finally
if FShowIdentical and FCancel then Free;