paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-05-31 05:52:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

SynEdit: Fix Bug #12944 (Trimming Spaces would prevent selecting a block)

Browse Source 
git-svn-id: trunk@18220 -
This commit is contained in:
martin 2009-01-09 00:34:16 +00:00
parent 55bb461186
commit ef8462c9fc
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/synedit/synedit.pp
View File

@ -2204,8 +2204,8 @@ begin
Exclude(fStateFlags, sfLinesChanging);
if HandleAllocated then begin
UpdateScrollBars;
SetBlockBegin({$IFDEF SYN_LAZARUS}PhysicalToLogicalPos(CaretXY)
{$ELSE}CaretXY{$ENDIF});
if not FTrimmedLinesView.IsTrimming then
SetBlockBegin(PhysicalToLogicalPos(CaretXY));
{$IFDEF VerboseSynEditInvalidate}
DebugLn(['TCustomSynEdit.LinesChanged ',dbgs(fInvalidateRect)]);
{$ENDIF}

9
components/synedit/synedittexttrimmer.pas
View File

@ -38,6 +38,7 @@ type
TSynEditStringTrimmingList = class(TSynEditStringsLinked)
private
fCaret: TSynEditCaret;
FIsTrimming: Boolean;
fUndoList: TSynEditUndoList;
fSpaces: String;
fLineText: String;
@ -82,6 +83,7 @@ type
property Enabled : Boolean read fEnabled write SetEnabled;
property UndoTrimmedSpaces: Boolean read FUndoTrimmedSpaces write FUndoTrimmedSpaces;
property UndoList: TSynEditUndoList read fUndoList write fUndoList;
property IsTrimming: Boolean read FIsTrimming;
end;
implementation
@ -98,6 +100,7 @@ begin
fSpaces := '';
fEnabled:=false;
FUndoTrimmedSpaces := False;
FIsTrimming := False;
Inherited Create(ASynStringSource);
end;
@ -114,6 +117,7 @@ var
begin
if (not fEnabled) then exit;
if (fLineIndex = TSynEditCaret(Sender).LinePos - 1) then exit;
FIsTrimming := True;
if (length(fSpaces) > 0) and (fLineIndex > 0)
and (fLineIndex <= fSynStrings.Count)
and (fLockCount = 0) then begin
@ -122,6 +126,7 @@ begin
fUndoList.AddChange(crTrimSpace, Point(1+length(s), fLineIndex+1),
Point(1+length(s)+length(fSpaces), fLineIndex+1), fSpaces, smNormal);
end;
FIsTrimming := False;
fLineIndex := TSynEditCaret(Sender).LinePos - 1;
fSpaces := '';
end;
@ -135,8 +140,10 @@ begin
FSpaces := '';
FLineIndex := -1;
FLockList.Clear;
FIsTrimming := True;
if fEnabled and (fLineIndex >= 0) and (fLineIndex < fSynStrings.Count) then
fSynStrings[fLineIndex] := TrimLine(fSynStrings[fLineIndex], fLineIndex);
FIsTrimming := False;
end;
procedure TSynEditStringTrimmingList.UndoRealSpaces(Item: TSynEditUndoItem);
@ -256,6 +263,7 @@ var
ltext: String;
begin
if (not fEnabled) then exit;
FIsTrimming := True;
i := fLockList.IndexOfObject(TObject(Pointer(fLineIndex)));
if i >= 0 then begin
fSpaces:= fLockList[i];
@ -274,6 +282,7 @@ begin
Point(1+llen+slen, index+1), fLockList[i], smNormal);
end;
end;
FIsTrimming := False;
fLockList.Clear;
end;