paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-21 22:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

LCL, fix grid should be focused after editing

Browse Source 
git-svn-id: trunk@25590 -
This commit is contained in:
jesus 2010-05-23 19:14:34 +00:00
parent 3a84a0a1c0
commit d7947be5e9
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lcl/grids.pas
View File

@ -134,7 +134,8 @@ type
TTitleStyle = (tsLazarus, tsStandard, tsNative);
TGridFlagsOption = (gfEditorUpdateLock, gfNeedsSelectActive, gfEditorTab,
gfRevEditorTab, gfVisualChange, gfDefRowHeightChanged, gfColumnsLocked);
gfRevEditorTab, gfVisualChange, gfDefRowHeightChanged, gfColumnsLocked,
gfEditingDone);
TGridFlags = set of TGridFlagsOption;
TSortOrder = (soAscending, soDescending);
@ -5670,8 +5671,14 @@ begin
end;
procedure TCustomGrid.DoEditorHide;
var
ParentForm: TCustomForm;
begin
{$ifdef dbgGrid}DebugLn('grid.DoEditorHide [',Editor.ClassName,'] INIT');{$endif}
if gfEditingDone in FGridFlags then begin
ParentForm := GetParentForm(Self);
ParentForm.ActiveControl := self;
end;
Editor.Visible:=False;
{$ifdef dbgGrid}DebugLn('grid.DoEditorHide [',Editor.ClassName,'] END');{$endif}
end;
@ -5850,8 +5857,10 @@ var
FGCache.TLColOff:=0;
FGCache.TLRowOff:=0;
SelectActive:=Sh;
Include(FGridFlags, gfEditingDone);
if MoveNextSelectable(Rel, aCol, aRow) then
Click;
Exclude(FGridFlags, gfEditingDone);
Key := 0; { Flag key as handled, even if selected cell did not move }
end;
const
@ -6780,8 +6789,10 @@ begin
VK_RETURN:
begin
Key := 0;
Include(FGridFlags, gfEditingDone);
if not MoveNextAuto(ssShift in Shift) then
ResetEditor;
Exclude(FGridFlags, gfEditingDone);
end;
end;
FEditorKey:=False;