paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-16 23:49:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

SynEdit: Check if suficent space for caret exists at line-end. fixes issue #0020053

Browse Source 
git-svn-id: trunk@32058 -
This commit is contained in:
martin 2011-08-25 23:46:14 +00:00
parent 20149c50e0
commit ab90477674
2 changed files with 39 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
components/synedit/synedit.pp
View File

@ -7492,10 +7492,10 @@ end;
procedure TCustomSynEdit.RecalcCharsAndLinesInWin(CheckCaret: Boolean);
var
NewLinesInWindow: Integer;
w: Integer;
begin
FCharsInWindow := Max(1, (ClientWidth
- TextLeftPixelOffset - TextRightPixelOffset
- ScrollBarWidth) div fCharWidth);
w := ClientWidth - TextLeftPixelOffset - TextRightPixelOffset - ScrollBarWidth;
FCharsInWindow := Max(1, w div fCharWidth);
NewLinesInWindow := Max(0,ClientHeight - ScrollBarWidth) div Max(1,fTextHeight);
if NewLinesInWindow <> FLinesInWindow then begin
@ -7505,9 +7505,12 @@ begin
StatusChanged([scLinesInWindow]);
end;
FScreenCaret.Lock;
FScreenCaret.ClipRect := Rect(TextLeftPixelOffset(False), 0,
ClientWidth - TextRightPixelOffset - ScrollBarWidth + 1,
ClientHeight - ScrollBarWidth);
FScreenCaret.ClipExtraPixel := w - fCharsInWindow * fCharWidth;
FScreenCaret.UnLock;
if CheckCaret then begin
if not (eoScrollPastEol in Options) then

43
components/synedit/syneditpointclasses.pas
View File

@ -262,7 +262,7 @@ type
FClipTop: Integer;
FDisplayPos: TPoint;
FDisplayType: TSynCaretType;
FExtraLineChars: Integer;
FExtraLinePixel, FExtraLineChars: Integer;
FOnExtraLineCharsChanged: TNotifyEvent;
FVisible: Boolean;
FHandleOwner: TWinControl;
@ -275,6 +275,7 @@ type
procedure SetDisplayType(const AType: TSynCaretType);
procedure SetVisible(const AValue: Boolean);
private
FClipExtraPixel: Integer;
{$IFDeF SynCaretDebug}
FDebugShowCount: Integer;
{$ENDIF}
@ -286,9 +287,11 @@ type
FLockCount: Integer;
FLockedUpdateNeeded: Boolean;
procedure SetClipBottom(const AValue: Integer);
procedure SetClipExtraPixel(AValue: Integer);
procedure SetClipLeft(const AValue: Integer);
procedure SetClipRect(const AValue: TRect);
procedure SetClipTop(const AValue: Integer);
procedure CalcExtraLineChars;
procedure UpdateDisplayType;
procedure UpdateDisplay;
procedure ShowCaret;
@ -310,6 +313,7 @@ type
property ClipTop: Integer read FClipTop write SetClipTop;
property ClipRect: TRect write SetClipRect;
property ClipBottom: Integer read FClipBottom write SetClipBottom;
property ClipExtraPixel: Integer read FClipExtraPixel write SetClipExtraPixel; // Amount of pixels, after the last full char (half visible char width)
property Visible: Boolean read FVisible write SetVisible;
property DisplayType: TSynCaretType read FDisplayType write SetDisplayType;
property DisplayPos: TPoint read FDisplayPos write SetDisplayPos;
@ -1580,6 +1584,7 @@ begin
FCurrentPosX := -1;
FCurrentPosY := -1;
FCurrentClippedWidth := -1;
FClipExtraPixel := 0;
FLockCount := 0;
end;
@ -1675,10 +1680,7 @@ begin
end;
procedure TSynEditScreenCaret.UpdateDisplayType;
var
OldExtraChars: Integer;
begin
OldExtraChars := FExtraLineChars;
case FDisplayType of
ctVerticalLine:
begin
@ -1686,7 +1688,7 @@ begin
FPixelHeight := FCharHeight - 2;
FOffsetX := -1;
FOffsetY := 1;
FExtraLineChars := 0;
FExtraLinePixel := 1;
end;
ctBlock:
begin
@ -1694,7 +1696,7 @@ begin
FPixelHeight := FCharHeight - 2;
FOffsetX := 0;
FOffsetY := 1;
FExtraLineChars := 1;
FExtraLinePixel := FCharWidth;
end;
ctHalfBlock:
begin
@ -1702,7 +1704,7 @@ begin
FPixelHeight := (FCharHeight - 2) div 2;
FOffsetX := 0;
FOffsetY := FPixelHeight + 1;
FExtraLineChars := 1;
FExtraLinePixel := FCharWidth;
end;
ctHorizontalLine:
begin
@ -1710,11 +1712,10 @@ begin
FPixelHeight := 2;
FOffsetX := 0;
FOffsetY := FCharHeight - 1;
FExtraLineChars := 1;
FExtraLinePixel := FCharWidth;
end;
end;
if (FExtraLineChars <> OldExtraChars) and assigned(FOnExtraLineCharsChanged) then
FOnExtraLineCharsChanged(Self);
CalcExtraLineChars;
UpdateDisplay;
end;
@ -1725,6 +1726,17 @@ begin
UpdateDisplay;
end;
procedure TSynEditScreenCaret.SetClipExtraPixel(AValue: Integer);
begin
if FClipExtraPixel = AValue then Exit;
{$IFDeF SynCaretDebug}
debugln(['SynEditCaret ClipRect for HandleOwner=',FHandleOwner, ' ExtraPixel=', dbgs(AValue)]);
{$ENDIF}
FClipExtraPixel := AValue;
CalcExtraLineChars;
UpdateDisplay;
end;
procedure TSynEditScreenCaret.SetClipLeft(const AValue: Integer);
begin
if FClipLeft = AValue then exit;
@ -1755,6 +1767,17 @@ begin
UpdateDisplay;
end;
procedure TSynEditScreenCaret.CalcExtraLineChars;
var
OldExtraChars: Integer;
begin
OldExtraChars := FExtraLineChars;
FExtraLineChars := Max(0, FExtraLinePixel - FClipExtraPixel + FCharWidth - 1)
div FCharWidth;
if (FExtraLineChars <> OldExtraChars) and assigned(FOnExtraLineCharsChanged) then
FOnExtraLineCharsChanged(Self);
end;
procedure TSynEditScreenCaret.UpdateDisplay;
begin
if FLockCount > 0 then begin