From 40d7ee77b6b7c03eedbcf80019b7830a461db8bd Mon Sep 17 00:00:00 2001 From: alexs75 Date: Tue, 25 Oct 2016 06:22:32 +0000 Subject: [PATCH] RxFPC:RxDBGrid - fix draw last collumn with OnDrawColumnCell event defined - ID0030781 git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5292 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- components/rx/trunk/rxdbgrid.pas | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/components/rx/trunk/rxdbgrid.pas b/components/rx/trunk/rxdbgrid.pas index 14de0e48c..ce0fc379b 100644 --- a/components/rx/trunk/rxdbgrid.pas +++ b/components/rx/trunk/rxdbgrid.pas @@ -3741,10 +3741,13 @@ var S: string; F: TField; C: TRxColumn; - j: integer; + j, DataCol: integer; begin if Assigned(OnDrawColumnCell) and not (CsDesigning in ComponentState) then - OnDrawColumnCell(Self, aRect, aCol, TColumn(ColumnFromGridColumn(aCol)), aState) + begin + DataCol := ColumnIndexFromGridColumn(aCol); + OnDrawColumnCell(Self, aRect, {aCol}DataCol, TColumn(ColumnFromGridColumn(aCol)), aState) + end else begin F := GetFieldFromGridColumn(aCol);