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

UPD: [Differ] Show "+" for added lines and "-" for deleted

Browse source
This commit is contained in:
Alexander Koblov 2010-05-06 18:30:09 +00:00
commit b507bdaeb6
2 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/fdiffer.pas
View file

@ -170,13 +170,13 @@ begin
case Kind of
ckAdd:
begin
SynDiffEditLeft.Lines.InsertObject(I, EmptyStr, nil);
SynDiffEditLeft.Lines.InsertObject(I, EmptyStr, TObject(0));
SynDiffEditRight.Lines.Objects[I]:= TObject(LineNumberRight)
end;
ckDelete:
begin
SynDiffEditLeft.Lines.Objects[I]:= TObject(LineNumberLeft);
SynDiffEditRight.Lines.InsertObject(I, EmptyStr, nil);
SynDiffEditRight.Lines.InsertObject(I, EmptyStr, TObject(-1));
end;
else
begin

17
src/usyndiffcontrols.pas
View file

@ -32,7 +32,7 @@ type
procedure SetDigitCount(AValue : integer);
procedure SetLeadingZeros(const AValue : boolean);
function FormatLineNumber(Line: integer; IsDot: boolean): string;
function FormatLineNumber(Line: integer; IsFakeLine: boolean): string;
protected
procedure DoChange(Sender: TObject); override;
public
@ -297,15 +297,18 @@ begin
end;
end;
function TSynDiffGutterLineNumber.FormatLineNumber(Line: Integer; IsDot: Boolean): String;
function TSynDiffGutterLineNumber.FormatLineNumber(Line: Integer; IsFakeLine: Boolean): String;
var
I: Integer;
begin
Result := EmptyStr;
// if a dot must be showed
if IsDot then
if IsFakeLine then
begin
Result := StringOfChar(' ', FAutoSizeDigitCount-1) + '.';
if Line = 0 then
Result := StringOfChar(' ', FAutoSizeDigitCount-1) + '+'
else
Result := StringOfChar(' ', FAutoSizeDigitCount-1) + '-';
end
// else format the line number
else
@ -365,7 +368,7 @@ var
rcLine: TRect;
S: String;
DC: HDC;
ShowDot: Boolean;
FakeLine: Boolean;
LineHeight: Integer;
SynDiffEdit: TSynDiffEdit;
begin
@ -406,9 +409,9 @@ begin
begin
iLine:= PtrInt(SynDiffEdit.Lines.Objects[iLine - 1]);
end;
ShowDot := (iLine = 0);
FakeLine := (iLine <= 0);
// Get the formatted line number or dot
S := FormatLineNumber(iLine, ShowDot);
S := FormatLineNumber(iLine, FakeLine);
Inc(rcLine.Bottom, LineHeight);
// erase the background and draw the line number string in one go
fTextDrawer.ExtTextOut(rcLine.Left, rcLine.Top, ETO_OPAQUE or ETO_CLIPPED, rcLine,