paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-20 12:59:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

synedit: fixed painting codefolding lines in text area

Browse Source 
git-svn-id: trunk@11670 -
This commit is contained in:
mattias 2007-07-29 14:55:53 +00:00
parent 133cc207e9
commit 2ed9da3c37
1 changed files with 22 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
components/synedit/synedit.pp
View File

@ -3338,7 +3338,6 @@ var
pszText: PChar; pszText: PChar;
nCharsToPaint: integer; nCharsToPaint: integer;
nX: integer; nX: integer;
ypos: integer;
const const
ETOOptions = ETO_OPAQUE; // Note: clipping is slow and not needed ETOOptions = ETO_OPAQUE; // Note: clipping is slow and not needed
begin begin
@ -3369,15 +3368,6 @@ var
// draw edge // draw edge
LCLIntf.MoveToEx(dc, nRightEdge, rcToken.Top, nil); LCLIntf.MoveToEx(dc, nRightEdge, rcToken.Top, nil);
LCLIntf.LineTo(dc, nRightEdge, rcToken.Bottom + 1); LCLIntf.LineTo(dc, nRightEdge, rcToken.Bottom + 1);
// codefold draw splitter line
if Gutter.ShowCodeFolding and (CurLine>=0)
and (TSynEditStringList(Lines).FoldType[CurLine-1] in [cfEnd])
and (TSynEditStringList(Lines).FoldEndLevel[CurLine-1] < CFDividerDrawLevel) then
begin
ypos := rcToken.Bottom - 1;
LCLIntf.MoveToEx(dc, nRightEdge, ypos, nil);
LCLIntf.LineTo(dc, fGutterWidth, ypos);
end;
// draw text // draw text
fTextDrawer.ExtTextOut(nX, rcToken.Top, ETOOptions-ETO_OPAQUE, rcToken, fTextDrawer.ExtTextOut(nX, rcToken.Top, ETOOptions-ETO_OPAQUE, rcToken,
pszText, nCharsToPaint); pszText, nCharsToPaint);
@ -3400,7 +3390,6 @@ var
C1SelPhys: integer; C1SelPhys: integer;
C2Phys: integer; C2Phys: integer;
C2SelPhys: LongInt; C2SelPhys: LongInt;
ypos : integer;
begin begin
// Compute some helper variables. // Compute some helper variables.
nC1 := Max(FirstColLogical, TokenAccu.CharsBefore + 1); nC1 := Max(FirstColLogical, TokenAccu.CharsBefore + 1);
@ -3499,16 +3488,6 @@ var
and (nRightEdge>=rcToken.Left) then begin and (nRightEdge>=rcToken.Left) then begin
LCLIntf.MoveToEx(dc, nRightEdge, rcToken.Top, nil); LCLIntf.MoveToEx(dc, nRightEdge, rcToken.Top, nil);
LCLIntf.LineTo(dc, nRightEdge, rcToken.Bottom + 1); LCLIntf.LineTo(dc, nRightEdge, rcToken.Bottom + 1);
// codefold draw splitter line
if Gutter.ShowCodeFolding and (CurLine>=0)
and (TSynEditStringList(Lines).FoldType[CurLine-1] in [cfEnd])
and (TSynEditStringList(Lines).FoldEndLevel[CurLine-1] < CFDividerDrawLevel) then
begin
ypos := rcToken.Bottom - 1;
LCLIntf.MoveToEx(dc, nRightEdge, ypos, nil);
LCLIntf.LineTo(dc, fGutterWidth, ypos);
end;
end; end;
end; end;
end; end;
@ -3740,6 +3719,7 @@ var
attr: TSynHighlighterAttributes; attr: TSynHighlighterAttributes;
LastTokenPosLogical: Integer; LastTokenPosLogical: Integer;
LastTokenPosPhyscial: Integer; LastTokenPosPhyscial: Integer;
ypos: Integer;
begin begin
// Initialize rcLine for drawing. Note that Top and Bottom are updated // Initialize rcLine for drawing. Note that Top and Bottom are updated
// inside the loop. Get only the starting point for this. // inside the loop. Get only the starting point for this.
@ -3928,6 +3908,16 @@ var
// of the invalid area with the correct colors. // of the invalid area with the correct colors.
PaintHighlightToken(TRUE); PaintHighlightToken(TRUE);
end; end;
// codefold draw splitter line
if Gutter.ShowCodeFolding and (CurLine>=0)
and (TSynEditStringList(Lines).FoldType[CurLine-1] in [cfEnd])
and (TSynEditStringList(Lines).FoldEndLevel[CurLine-1] < CFDividerDrawLevel) then
begin
ypos := rcToken.Bottom - 1;
LCLIntf.MoveToEx(dc, nRightEdge, ypos, nil);
LCLIntf.LineTo(dc, fGutterWidth, ypos);
end;
end; end;
CurLine:=-1; CurLine:=-1;
end; end;
@ -4077,9 +4067,9 @@ begin
nRightEdge := fTextOffset + fRightEdge * fCharWidth; // pixel value nRightEdge := fTextOffset + fRightEdge * fCharWidth; // pixel value
if (nRightEdge >= AClip.Left) and (nRightEdge <= AClip.Right) then begin if (nRightEdge >= AClip.Left) and (nRightEdge <= AClip.Right) then begin
bDoRightEdge := TRUE; bDoRightEdge := TRUE;
Canvas.Pen.Color := fRightEdgeColor;
Canvas.Pen.Width := 1;
end; end;
Canvas.Pen.Color := fRightEdgeColor;
Canvas.Pen.Width := 1;
end; end;
// Do everything else with API calls. This (maybe) realizes the new pen color. // Do everything else with API calls. This (maybe) realizes the new pen color.
dc := Canvas.Handle; dc := Canvas.Handle;
@ -4122,16 +4112,16 @@ begin
if bDoRightEdge and (not (eoHideRightMargin in Options)) then begin if bDoRightEdge and (not (eoHideRightMargin in Options)) then begin
LCLIntf.MoveToEx(dc, nRightEdge, rcToken.Top, nil); LCLIntf.MoveToEx(dc, nRightEdge, rcToken.Top, nil);
LCLIntf.LineTo(dc, nRightEdge, rcToken.Bottom + 1); LCLIntf.LineTo(dc, nRightEdge, rcToken.Bottom + 1);
end;
//codefold draw splitter line // codefold draw splitter line
if Gutter.ShowCodeFolding and (LastLine<Lines.Count) if Gutter.ShowCodeFolding and (LastLine<Lines.Count)
and (TSynEditStringList(Lines).FoldType[LastLine-1] in [cfEnd]) and (TSynEditStringList(Lines).FoldType[LastLine-1] in [cfEnd])
and (TSynEditStringList(Lines).FoldEndLevel[LastLine-1] < CFDividerDrawLevel) then and (TSynEditStringList(Lines).FoldEndLevel[LastLine-1] < CFDividerDrawLevel) then
begin begin
ypos := rcToken.Bottom - 1; ypos := rcToken.Bottom - 1;
LCLIntf.MoveToEx(dc, nRightEdge, ypos, nil); LCLIntf.MoveToEx(dc, nRightEdge, ypos, nil);
LCLIntf.LineTo(dc, fGutterWidth, ypos); LCLIntf.LineTo(dc, fGutterWidth, ypos);
end;
end; end;
end; end;