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

RxFPC:RxDBGrid - fix cell background color on empty dataset

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6955 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
alexs75
2019-05-27 06:13:32 +00:00
parent d5a28a73ae
commit b12dffeafa
3 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/rx/trunk/languages/rxconst.uk.po
View File

@ -210,7 +210,7 @@ msgid "Question"
msgstr "" msgstr ""
#: rxconst.sreqvalue #: rxconst.sreqvalue
#, fuzzy, object-pascal-format #, object-pascal-format, fuzzy
#| msgid "Error. Expected value for filed %s." #| msgid "Error. Expected value for filed %s."
msgid "Error. Expected value for field %s." msgid "Error. Expected value for field %s."
msgstr "Поле %s. Вимагається значення" msgstr "Поле %s. Вимагається значення"

2
components/rx/trunk/languages/rxdconst.es.po
View File

@ -75,7 +75,7 @@ msgid "Data changed. Save?"
msgstr "Dato cambiado. Salvar?" msgstr "Dato cambiado. Salvar?"
#: rxdconst.sdatabasename #: rxdconst.sdatabasename
#, fuzzy, object-pascal-format #, object-pascal-format, fuzzy
#| msgid "Database loocked: %s" #| msgid "Database loocked: %s"
msgid "Database locked: %s" msgid "Database locked: %s"
msgstr "Base de Dato bloqueada: %s" msgstr "Base de Dato bloqueada: %s"

40
components/rx/trunk/rxdb/rxdbgrid.pas
View File

@ -4700,26 +4700,26 @@ begin
CalcCellExtent(acol, arow, aRect); CalcCellExtent(acol, arow, aRect);
PrepareCanvas(aCol, aRow, aState); PrepareCanvas(aCol, aRow, aState);
if FGroupItems.Active and Assigned(FGroupItemDrawCur) then
begin
gRect:=aRect;
aRect.Bottom:=aRect.Bottom - DefaultRowHeight - 1;
gRect.Top:=aRect.Bottom;
gRect.Bottom:=gRect.Bottom - 2;
end;
if Assigned(FOnGetCellProps) and not (gdSelected in aState) then
begin
FBackground := Canvas.Brush.Color;
FOnGetCellProps(Self, GetFieldFromGridColumn(aCol), Canvas.Font, FBackground);
Canvas.Brush.Color := FBackground;
end;
Canvas.FillRect(aRect);
DrawCellGrid(aCol, aRow, aRect, aState);
if DataSetNotEmpty then if DataSetNotEmpty then
begin begin
if FGroupItems.Active and Assigned(FGroupItemDrawCur) then
begin
gRect:=aRect;
aRect.Bottom:=aRect.Bottom - DefaultRowHeight - 1;
gRect.Top:=aRect.Bottom;
gRect.Bottom:=gRect.Bottom - 2;
end;
if Assigned(FOnGetCellProps) and not (gdSelected in aState) then
begin
FBackground := Canvas.Brush.Color;
FOnGetCellProps(Self, GetFieldFromGridColumn(aCol), Canvas.Font, FBackground);
Canvas.Brush.Color := FBackground;
end;
Canvas.FillRect(aRect);
DrawCellGrid(aCol, aRow, aRect, aState);
RxColumn := TRxColumn(ColumnFromGridColumn(aCol)); RxColumn := TRxColumn(ColumnFromGridColumn(aCol));
if Assigned(RxColumn) and Assigned(RxColumn.Field) and if Assigned(RxColumn) and Assigned(RxColumn.Field) and
Assigned(RxColumn.ImageList) then Assigned(RxColumn.ImageList) then
@ -4730,8 +4730,7 @@ begin
DrawCellBitmap(RxColumn, aRect, aState, AImageIndex); DrawCellBitmap(RxColumn, aRect, aState, AImageIndex);
end end
else else
DefaultDrawCellData(aCol, aRow, aRect, aState) DefaultDrawCellData(aCol, aRow, aRect, aState);
;
if FGroupItems.Active and Assigned(FGroupItemDrawCur) then if FGroupItems.Active and Assigned(FGroupItemDrawCur) then
begin begin
@ -4752,6 +4751,7 @@ begin
if C.FGroupParam.FValueType <> fvtNon then if C.FGroupParam.FValueType <> fvtNon then
WriteTextHeader(Canvas, gRect, C.FGroupParam.DisplayText, C.FGroupParam.Alignment); WriteTextHeader(Canvas, gRect, C.FGroupParam.DisplayText, C.FGroupParam.Alignment);
end; end;
end; end;
end end
else else