LCL, fix grids not hiding editor in TValueListEditor, issue #24273

git-svn-id: trunk@40831 -
This commit is contained in:
jesus 2013-04-17 00:45:31 +00:00
parent b565a9a1ee
commit 2ef3cf5a5c

View File

@ -5994,11 +5994,12 @@ begin
gzNormal:
begin
LockEditor;
FIgnoreClick := False;
WasFocused := Focused;
if not WasFocused then
SetFocus;
UnlockEditor;
if IsCellButtonColumn(FGCache.ClickCell) then begin
fGridState := gsButtonColumnClicking;
DoPushCell;
@ -7448,8 +7449,8 @@ begin
or (not HandleAllocated) then
Exit;
if EditingAllowed(FCol) and CanEditShow and
(not FEditorShowing) and (Editor<>nil) and (not Editor.Visible) then
if EditingAllowed(FCol) and CanEditShow and (not FEditorShowing) and
(Editor<>nil) and (not Editor.Visible) and (not EditorLocked) then
begin
{$ifdef dbgGrid} DebugLnEnter('EditorShow [',Editor.ClassName,'] INIT FCol=',IntToStr(FCol),' FRow=',IntToStr(FRow));{$endif}
FEditorMode:=True;