pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

fpspreadsheet: second attempt to fix worksheetgrid writing edited cell to wrong cell when grid is on MDI form (issue #37596).

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@7644 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2020-09-05 22:33:26 +00:00
parent 96dc6b9939
commit 8b5cc6b3d9
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/fpspreadsheet/source/visual/fpspreadsheetgrid.pas
View File

@ -3370,7 +3370,8 @@ procedure TsCustomWorksheetGrid.EditorDoGetValue;
var var
cell: Pcell; cell: Pcell;
begin begin
if (Editor<>nil) and Editor.Visible and (FOldEditorText <> FEditText) then inherited;
if (FOldEditorText <> FEditText) then
begin begin
cell := Worksheet.GetCell(GetWorksheetRow(Row), GetWorksheetCol(Col)); cell := Worksheet.GetCell(GetWorksheetRow(Row), GetWorksheetCol(Col));
if Worksheet.IsMerged(cell) then if Worksheet.IsMerged(cell) then
@ -3382,7 +3383,6 @@ begin
FEditText := ''; FEditText := '';
FOldEditorText := ''; FOldEditorText := '';
end; end;
inherited;
end; end;
function TsCustomWorksheetGrid.EditorByStyle(Style: TColumnButtonStyle): TWinControl; function TsCustomWorksheetGrid.EditorByStyle(Style: TColumnButtonStyle): TWinControl;