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

SynEdit: Handle #13 if it's not a SynKeyStroke. This allows #13 to be passed on in OnKeyPressed. Issue #9195

Browse Source 
git-svn-id: trunk@20009 -
This commit is contained in:
martin 2009-05-17 13:34:49 +00:00
parent fd36716c15
commit 331b3f8019
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
components/synedit/synedit.pp
View File

@ -2268,7 +2268,7 @@ end;
procedure TCustomSynEdit.UTF8KeyPress(var Key: TUTF8Char); procedure TCustomSynEdit.UTF8KeyPress(var Key: TUTF8Char);
begin begin
if Key='' then exit; if Key='' then exit;
// don't fire the event if key is to be ignored // don't fire the event if key is to be ignored
if not (sfIgnoreNextChar in fStateFlags) then begin if not (sfIgnoreNextChar in fStateFlags) then begin
if Assigned(OnUTF8KeyPress) then OnUTF8KeyPress(Self, Key); if Assigned(OnUTF8KeyPress) then OnUTF8KeyPress(Self, Key);
@ -2281,7 +2281,7 @@ begin
{$ENDIF} {$ENDIF}
CommandProcessor(ecChar, Key, nil); CommandProcessor(ecChar, Key, nil);
// Check if ecChar has handled the Key; Todo: move the condition, in one common place // Check if ecChar has handled the Key; Todo: move the condition, in one common place
if not ReadOnly and (Key >= #32) and (Key <> #127) then if not ReadOnly and ((Key = #13) or (Key >= #32)) and (Key <> #127) then
Key:=''; Key:='';
end else begin end else begin
// don't ignore further keys // don't ignore further keys
@ -2302,7 +2302,7 @@ begin
if Assigned(OnKeyPress) then OnKeyPress(Self, Key); if Assigned(OnKeyPress) then OnKeyPress(Self, Key);
CommandProcessor(ecChar, Key, nil); CommandProcessor(ecChar, Key, nil);
// Check if ecChar has handled the Key; Todo: move the condition, in one common place // Check if ecChar has handled the Key; Todo: move the condition, in one common place
if not ReadOnly and (Key >= #32) and (Key <> #127) then if not ReadOnly and ((Key = #13) or (Key >= #32)) and (Key <> #127) then
Key:=#0; Key:=#0;
end else begin end else begin
// don't ignore further keys // don't ignore further keys
@ -6073,6 +6073,19 @@ begin
FCaret.DecForcePastEOL; FCaret.DecForcePastEOL;
end; end;
end; end;
end
else if not ReadOnly and (AChar = #13) then begin
// ecLineBreak is not assigned
// Insert a linebreak, but do not apply any other functionality (such as indent)
if FTheLinesView.Count = 0 then
FTheLinesView.Add('');
if SelAvail then
SetSelTextExternal('');
LogCaretXY:=PhysicalToLogicalPos(CaretXY);
FTheLinesView.EditLineBreak(LogCaretXY.X, LogCaretXY.Y);
CaretXY := Point(1, CaretY + 1);
EnsureCursorPosVisible;
fLastCaretX := CaretX;
end; end;
ecUndo: ecUndo:
begin begin