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

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@1240 8e941d3f-bd1b-0410-a28a-d453659cc2b4

Browse Source
This commit is contained in:
alexs75
2010-06-29 16:38:27 +00:00
parent 68477cc125
commit 0a7ffce366
3 changed files with 103 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
components/rx/rxdbgrid.pas
View File

@@ -1120,7 +1120,7 @@ var
H, H1, W, H2:integer;
rxCol, rxColNext:TRxColumn;
rxTit, rxTitleNext:TRxColumnTitle;
MLRec1:TMLCaptionItem;
MLRec1, P:TMLCaptionItem;
MLRec2:TMLCaptionItem;
tmpCanvas: TCanvas;
begin
@@ -1151,15 +1151,6 @@ begin
rxColNext:=TRxColumn(Columns[i+1]);
rxTitleNext:=TRxColumnTitle(rxColNext.Title);
end;
{ TODO -oalexs : Тут необходимо также обработать скрытые столбцы }
{
j:=i;
while j < Columns.Count-1 then
begin
if
inc(j);
end;
}
W:=Max(rxCol.Width-6, 1);
if rxTit.CaptionLinesCount > 0 then
@@ -1172,7 +1163,7 @@ begin
if Assigned(rxTitleNext) and (rxTitleNext.CaptionLinesCount>j) then
begin
//make links to next column (and in the next column set linc to prior-current)
//make links to next column (and in the next column set link to prior-current)
MLRec2:=rxTitleNext.CaptionLine(j);
if MLRec1.Caption = MLRec2.Caption then
begin
@@ -1214,6 +1205,29 @@ begin
end;
end;
//Тут расчёт высоты заголовка каждой колонки - надо обработать слитые заголовки
{ for i:=0 to Columns.Count-1 do
begin
rxCol:=TRxColumn(Columns[i]);
if Assigned(rxCol) and rxCol.Visible then
begin
for j:=0 to rxTit.CaptionLinesCount-1 do
begin
MLRec1:=rxTit.CaptionLine(j);
if not Assigned(MLRec1.Prior) then
begin
W:=MLRec1.Width;
P:=MLRec1.Next;
while Assigned(P) do
begin
Inc(W, P.Width);
P:=P.Next;
end;
end;
end;
end;
end;}
RowHeights[0] := DefaultRowHeight * ({FTitleLines+}H);
if rdgFilter in OptionsRx then