paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-13 12:39:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

LCL, grids, allow the RETURN key to go to OnKeyPress

Browse Source 
git-svn-id: trunk@42992 -
This commit is contained in:
jesus 2013-09-27 18:28:28 +00:00
parent 6ab0ade4ee
commit 60927657c9
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lcl/grids.pas
View File

@ -7711,13 +7711,6 @@ begin
{$ifdef dbgGrid}DebugLn('Grid.EditorKeyDown Key=',dbgs(Key),' INIT');{$endif}
FEditorKey:=True; // Just a flag to see from where the event comes
KeyDown(Key, shift);
if Key = VK_RETURN then begin
Key := 0;
Include(FGridFlags, gfEditingDone);
if not MoveNextAuto(ssShift in Shift) then
ResetEditor;
Exclude(FGridFlags, gfEditingDone);
end;
FEditorKey:=False;
{$ifdef dbgGrid}DebugLn('Grid.EditorKeyDown Key=',dbgs(Key),' END');{$endif}
end;
@ -7740,7 +7733,16 @@ begin
{$ifdef dbgGrid}DebugLn('Grid.EditorKeyPress: inter Key=',PrintKey);{$Endif}
case Key of
^C,^V,^X:;
^M, #27: Key:=#0; // key is already handled in KeyDown
^M:
begin
Include(FGridFlags, gfEditingDone);
if not MoveNextAuto(GetKeyState(VK_SHIFT) < 0) then
ResetEditor;
Exclude(FGridFlags, gfEditingDone);
Key := #0;
end;
else begin
AChar := Key;
if not EditorCanAcceptKey(AChar) or EditorIsReadOnly then