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

fix cell height in multitytle

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@1248 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
alexs75
2010-07-08 17:43:31 +00:00
parent 4d27b9bce7
commit f666465eaa
3 changed files with 131 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

151
components/rx/Demos/RxDBGrid/RxDBGridDemo.lpi
View File

@ -52,14 +52,14 @@
<MinVersion Major="1" Release="18" Build="56" Valid="True"/> <MinVersion Major="1" Release="18" Build="56" Valid="True"/>
</Item4> </Item4>
</RequiredPackages> </RequiredPackages>
<Units Count="59"> <Units Count="60">
<Unit0> <Unit0>
<Filename Value="RxDBGridDemo.lpr"/> <Filename Value="RxDBGridDemo.lpr"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<UnitName Value="RxDBGridDemo"/> <UnitName Value="RxDBGridDemo"/>
<TopLine Value="1"/> <TopLine Value="1"/>
<CursorPos X="5" Y="17"/> <CursorPos X="5" Y="17"/>
<UsageCount Value="45"/> <UsageCount Value="47"/>
</Unit0> </Unit0>
<Unit1> <Unit1>
<Filename Value="rxdbgridmainunit.pas"/> <Filename Value="rxdbgridmainunit.pas"/>
@ -70,8 +70,8 @@
<EditorIndex Value="0"/> <EditorIndex Value="0"/>
<WindowIndex Value="0"/> <WindowIndex Value="0"/>
<TopLine Value="148"/> <TopLine Value="148"/>
<CursorPos X="15" Y="157"/> <CursorPos X="12" Y="157"/>
<UsageCount Value="45"/> <UsageCount Value="47"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit1> </Unit1>
<Unit2> <Unit2>
@ -305,7 +305,7 @@
<WindowIndex Value="0"/> <WindowIndex Value="0"/>
<TopLine Value="472"/> <TopLine Value="472"/>
<CursorPos X="1" Y="491"/> <CursorPos X="1" Y="491"/>
<UsageCount Value="12"/> <UsageCount Value="13"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit34> </Unit34>
<Unit35> <Unit35>
@ -378,9 +378,9 @@
<UnitName Value="DBGrids"/> <UnitName Value="DBGrids"/>
<EditorIndex Value="2"/> <EditorIndex Value="2"/>
<WindowIndex Value="0"/> <WindowIndex Value="0"/>
<TopLine Value="1755"/> <TopLine Value="1766"/>
<CursorPos X="36" Y="1773"/> <CursorPos X="36" Y="1773"/>
<UsageCount Value="10"/> <UsageCount Value="11"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit43> </Unit43>
<Unit44> <Unit44>
@ -396,13 +396,13 @@
<IsVisibleTab Value="True"/> <IsVisibleTab Value="True"/>
<EditorIndex Value="1"/> <EditorIndex Value="1"/>
<WindowIndex Value="0"/> <WindowIndex Value="0"/>
<TopLine Value="1216"/> <TopLine Value="1579"/>
<CursorPos X="10" Y="1238"/> <CursorPos X="53" Y="1588"/>
<UsageCount Value="12"/> <UsageCount Value="13"/>
<Bookmarks Count="3"> <Bookmarks Count="3">
<Item0 X="3" Y="2222" ID="3"/> <Item0 X="3" Y="2246" ID="3"/>
<Item1 X="18" Y="1234" ID="1"/> <Item1 X="13" Y="1203" ID="1"/>
<Item2 X="3" Y="1518" ID="2"/> <Item2 X="11" Y="1602" ID="2"/>
</Bookmarks> </Bookmarks>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit45> </Unit45>
@ -455,10 +455,8 @@
<WindowIndex Value="0"/> <WindowIndex Value="0"/>
<TopLine Value="5699"/> <TopLine Value="5699"/>
<CursorPos X="1" Y="5702"/> <CursorPos X="1" Y="5702"/>
<SyntaxHighlighter Value="FreePascal"/> <UsageCount Value="13"/>
<UsageCount Value="12"/>
<Loaded Value="True"/> <Loaded Value="True"/>
<DefaultSyntaxHighlighter Value="Text"/>
</Unit51> </Unit51>
<Unit52> <Unit52>
<Filename Value="/usr/local/share/lazarus/components/synedit/syneditkeycmds.pp"/> <Filename Value="/usr/local/share/lazarus/components/synedit/syneditkeycmds.pp"/>
@ -467,10 +465,8 @@
<WindowIndex Value="0"/> <WindowIndex Value="0"/>
<TopLine Value="750"/> <TopLine Value="750"/>
<CursorPos X="3" Y="752"/> <CursorPos X="3" Y="752"/>
<SyntaxHighlighter Value="FreePascal"/> <UsageCount Value="13"/>
<UsageCount Value="12"/>
<Loaded Value="True"/> <Loaded Value="True"/>
<DefaultSyntaxHighlighter Value="Text"/>
</Unit52> </Unit52>
<Unit53> <Unit53>
<Filename Value="../../../../../../install/fpcsrc/rtl/objpas/classes/classes.inc"/> <Filename Value="../../../../../../install/fpcsrc/rtl/objpas/classes/classes.inc"/>
@ -526,133 +522,139 @@
<WindowIndex Value="0"/> <WindowIndex Value="0"/>
<TopLine Value="286"/> <TopLine Value="286"/>
<CursorPos X="1" Y="288"/> <CursorPos X="1" Y="288"/>
<SyntaxHighlighter Value="FreePascal"/> <UsageCount Value="12"/>
<UsageCount Value="11"/>
<Loaded Value="True"/> <Loaded Value="True"/>
<DefaultSyntaxHighlighter Value="Text"/>
</Unit58> </Unit58>
<Unit59>
<Filename Value="/usr/local/share/lazarus/lcl/grids.pas"/>
<UnitName Value="Grids"/>
<WindowIndex Value="0"/>
<TopLine Value="992"/>
<CursorPos X="14" Y="1011"/>
<UsageCount Value="10"/>
</Unit59>
</Units> </Units>
<JumpHistory Count="29" HistoryIndex="28"> <JumpHistory Count="29" HistoryIndex="28">
<Position1> <Position1>
<Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/> <Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
<Caret Line="441" Column="32" TopLine="418"/> <Caret Line="1220" Column="58" TopLine="1200"/>
</Position1> </Position1>
<Position2> <Position2>
<Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/> <Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
<Caret Line="2769" Column="21" TopLine="2769"/> <Caret Line="1218" Column="1" TopLine="1200"/>
</Position2> </Position2>
<Position3> <Position3>
<Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/> <Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
<Caret Line="1" Column="1" TopLine="1"/> <Caret Line="1220" Column="1" TopLine="1200"/>
</Position3> </Position3>
<Position4> <Position4>
<Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/> <Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
<Caret Line="441" Column="22" TopLine="423"/> <Caret Line="1250" Column="1" TopLine="1231"/>
</Position4> </Position4>
<Position5> <Position5>
<Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/> <Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
<Caret Line="2769" Column="28" TopLine="2751"/> <Caret Line="1213" Column="1" TopLine="1194"/>
</Position5> </Position5>
<Position6> <Position6>
<Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/> <Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
<Caret Line="2772" Column="13" TopLine="2754"/> <Caret Line="1214" Column="1" TopLine="1194"/>
</Position6> </Position6>
<Position7> <Position7>
<Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/> <Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
<Caret Line="229" Column="15" TopLine="211"/> <Caret Line="1215" Column="1" TopLine="1194"/>
</Position7> </Position7>
<Position8> <Position8>
<Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/> <Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
<Caret Line="3543" Column="4" TopLine="3538"/> <Caret Line="1216" Column="1" TopLine="1194"/>
</Position8> </Position8>
<Position9> <Position9>
<Filename Value="../../../../../../install/fpcsrc/rtl/objpas/classes/collect.inc"/> <Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
<Caret Line="50" Column="20" TopLine="42"/> <Caret Line="1218" Column="1" TopLine="1194"/>
</Position9> </Position9>
<Position10> <Position10>
<Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/> <Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
<Caret Line="124" Column="55" TopLine="103"/> <Caret Line="1219" Column="1" TopLine="1194"/>
</Position10> </Position10>
<Position11> <Position11>
<Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/> <Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
<Caret Line="2774" Column="3" TopLine="2756"/> <Caret Line="1220" Column="1" TopLine="1194"/>
</Position11> </Position11>
<Position12> <Position12>
<Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/> <Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
<Caret Line="3571" Column="37" TopLine="3553"/> <Caret Line="1222" Column="1" TopLine="1194"/>
</Position12> </Position12>
<Position13> <Position13>
<Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/> <Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
<Caret Line="3552" Column="85" TopLine="3549"/> <Caret Line="1223" Column="1" TopLine="1206"/>
</Position13> </Position13>
<Position14> <Position14>
<Filename Value="rxdbgridmainunit.pas"/> <Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
<Caret Line="132" Column="74" TopLine="100"/> <Caret Line="1224" Column="1" TopLine="1206"/>
</Position14> </Position14>
<Position15> <Position15>
<Filename Value="rxdbgridmainunit.pas"/> <Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
<Caret Line="134" Column="74" TopLine="102"/> <Caret Line="1226" Column="1" TopLine="1206"/>
</Position15> </Position15>
<Position16> <Position16>
<Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/> <Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
<Caret Line="570" Column="16" TopLine="538"/> <Caret Line="1227" Column="1" TopLine="1206"/>
</Position16> </Position16>
<Position17> <Position17>
<Filename Value="/usr/local/share/lazarus/lcl/dbgrids.pas"/> <Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
<Caret Line="457" Column="84" TopLine="439"/> <Caret Line="1228" Column="1" TopLine="1206"/>
</Position17> </Position17>
<Position18> <Position18>
<Filename Value="/usr/local/share/lazarus/lcl/dbgrids.pas"/> <Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
<Caret Line="561" Column="26" TopLine="543"/> <Caret Line="1230" Column="1" TopLine="1206"/>
</Position18> </Position18>
<Position19> <Position19>
<Filename Value="/usr/local/share/lazarus/lcl/dbgrids.pas"/> <Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
<Caret Line="1773" Column="27" TopLine="1757"/> <Caret Line="1231" Column="1" TopLine="1206"/>
</Position19> </Position19>
<Position20> <Position20>
<Filename Value="/usr/local/share/lazarus/lcl/dbgrids.pas"/> <Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
<Caret Line="1" Column="1" TopLine="1"/> <Caret Line="1230" Column="1" TopLine="1206"/>
</Position20> </Position20>
<Position21> <Position21>
<Filename Value="/usr/local/share/lazarus/lcl/dbgrids.pas"/> <Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
<Caret Line="413" Column="26" TopLine="395"/> <Caret Line="1231" Column="1" TopLine="1206"/>
</Position21> </Position21>
<Position22> <Position22>
<Filename Value="rxdbgridmainunit.pas"/> <Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
<Caret Line="152" Column="1" TopLine="150"/> <Caret Line="1233" Column="1" TopLine="1206"/>
</Position22> </Position22>
<Position23> <Position23>
<Filename Value="rxdbgridmainunit.pas"/> <Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
<Caret Line="151" Column="1" TopLine="149"/> <Caret Line="1234" Column="1" TopLine="1206"/>
</Position23> </Position23>
<Position24> <Position24>
<Filename Value="rxdbgridmainunit.pas"/> <Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
<Caret Line="157" Column="15" TopLine="148"/> <Caret Line="1235" Column="1" TopLine="1206"/>
</Position24> </Position24>
<Position25> <Position25>
<Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/> <Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
<Caret Line="480" Column="36" TopLine="474"/> <Caret Line="1239" Column="1" TopLine="1207"/>
</Position25> </Position25>
<Position26> <Position26>
<Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/> <Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
<Caret Line="3073" Column="33" TopLine="3041"/> <Caret Line="391" Column="35" TopLine="364"/>
</Position26> </Position26>
<Position27> <Position27>
<Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/> <Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
<Caret Line="1233" Column="21" TopLine="1212"/> <Caret Line="1366" Column="41" TopLine="1347"/>
</Position27> </Position27>
<Position28> <Position28>
<Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/> <Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
<Caret Line="1144" Column="108" TopLine="1118"/> <Caret Line="1596" Column="30" TopLine="1566"/>
</Position28> </Position28>
<Position29> <Position29>
<Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/> <Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
<Caret Line="1234" Column="18" TopLine="1219"/> <Caret Line="1597" Column="24" TopLine="1576"/>
</Position29> </Position29>
</JumpHistory> </JumpHistory>
</ProjectOptions> </ProjectOptions>
<CompilerOptions> <CompilerOptions>
<Version Value="8"/> <Version Value="9"/>
<Target> <Target>
<Filename Value="RxDBGridDemo"/> <Filename Value="RxDBGridDemo"/>
</Target> </Target>
@ -660,6 +662,11 @@
<UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/> <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
<SrcPath Value="$(LazarusDir)/lcl/;$(LazarusDir)/lcl/interfaces/$(LCLWidgetType)/"/> <SrcPath Value="$(LazarusDir)/lcl/;$(LazarusDir)/lcl/interfaces/$(LCLWidgetType)/"/>
</SearchPaths> </SearchPaths>
<Parsing>
<SyntaxOptions>
<UseAnsiStrings Value="False"/>
</SyntaxOptions>
</Parsing>
<Linking> <Linking>
<Options> <Options>
<Win32> <Win32>
@ -678,17 +685,25 @@
<Line Value="1043"/> <Line Value="1043"/>
</Item1> </Item1>
</BreakPoints> </BreakPoints>
<Watches Count="3"> <Watches Count="6">
<Item1> <Item1>
<Expression Value="W"/> <Expression Value="rxTit.FCaption"/>
</Item1> </Item1>
<Item2> <Item2>
<Expression Value="aRect"/> <Expression Value="H"/>
</Item2> </Item2>
<Item3> <Item3>
<Expression Value="K.Enabled)"/> <Expression Value="W"/>
<Enabled Value="False"/>
</Item3> </Item3>
<Item4>
<Expression Value="W1"/>
</Item4>
<Item5>
<Expression Value="S"/>
</Item5>
<Item6>
<Expression Value="H1"/>
</Item6>
</Watches> </Watches>
<Exceptions Count="1"> <Exceptions Count="1">
<Item1> <Item1>

34
components/rx/Demos/RxDBGrid/rxdbgridmainunit.lfm
View File

@ -66,7 +66,7 @@ object RxDBGridMainForm: TRxDBGridMainForm
end end
item item
Title.Alignment = taCenter Title.Alignment = taCenter
Title.Caption = 'Software (all info)|Name' Title.Caption = 'Computer software (all info) - Программное обеспечение|Name'
Title.Orientation = toHorizontal Title.Orientation = toHorizontal
Width = 136 Width = 136
FieldName = 'NAME' FieldName = 'NAME'
@ -79,7 +79,7 @@ object RxDBGridMainForm: TRxDBGridMainForm
end end
item item
Title.Alignment = taCenter Title.Alignment = taCenter
Title.Caption = 'Software (all info)|Cost' Title.Caption = 'Computer software (all info) - Программное обеспечение|Cost'
Title.Orientation = toHorizontal Title.Orientation = toHorizontal
Width = 136 Width = 136
FieldName = 'PRICE' FieldName = 'PRICE'
@ -97,7 +97,7 @@ object RxDBGridMainForm: TRxDBGridMainForm
end end
item item
Title.Alignment = taCenter Title.Alignment = taCenter
Title.Caption = 'Software (all info)|Date Present' Title.Caption = 'Computer software (all info) - Программное обеспечение|Date Present'
Title.Orientation = toHorizontal Title.Orientation = toHorizontal
Width = 136 Width = 136
FieldName = 'Date_Present' FieldName = 'Date_Present'
@ -180,10 +180,10 @@ object RxDBGridMainForm: TRxDBGridMainForm
AnchorSideLeft.Control = Button2 AnchorSideLeft.Control = Button2
AnchorSideLeft.Side = asrBottom AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = Panel1 AnchorSideTop.Control = Panel1
Left = 272 Left = 260
Height = 18 Height = 18
Top = 7 Top = 7
Width = 40 Width = 36
BorderSpacing.Around = 6 BorderSpacing.Around = 6
Caption = 'Mode' Caption = 'Mode'
ParentColor = False ParentColor = False
@ -194,7 +194,7 @@ object RxDBGridMainForm: TRxDBGridMainForm
Left = 7 Left = 7
Height = 29 Height = 29
Top = 7 Top = 7
Width = 87 Width = 84
Action = actCalcTotal Action = actCalcTotal
AutoSize = True AutoSize = True
BorderSpacing.Around = 6 BorderSpacing.Around = 6
@ -204,10 +204,10 @@ object RxDBGridMainForm: TRxDBGridMainForm
AnchorSideLeft.Control = Button1 AnchorSideLeft.Control = Button1
AnchorSideLeft.Side = asrBottom AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = Panel1 AnchorSideTop.Control = Panel1
Left = 100 Left = 97
Height = 29 Height = 29
Top = 7 Top = 7
Width = 166 Width = 157
Action = actOptimizeColumnsWidthAll Action = actOptimizeColumnsWidthAll
AutoSize = True AutoSize = True
BorderSpacing.Around = 6 BorderSpacing.Around = 6
@ -218,10 +218,10 @@ object RxDBGridMainForm: TRxDBGridMainForm
AnchorSideLeft.Side = asrBottom AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = CheckBox2 AnchorSideTop.Control = CheckBox2
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 501 Left = 489
Height = 22 Height = 22
Top = 35 Top = 35
Width = 86 Width = 81
BorderSpacing.Left = 6 BorderSpacing.Left = 6
Caption = 'Use filter' Caption = 'Use filter'
OnChange = CheckBox1Change OnChange = CheckBox1Change
@ -231,7 +231,7 @@ object RxDBGridMainForm: TRxDBGridMainForm
AnchorSideLeft.Control = Label1 AnchorSideLeft.Control = Label1
AnchorSideTop.Control = Label1 AnchorSideTop.Control = Label1
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 278 Left = 266
Height = 31 Height = 31
Top = 31 Top = 31
Width = 217 Width = 217
@ -251,10 +251,10 @@ object RxDBGridMainForm: TRxDBGridMainForm
AnchorSideLeft.Control = ComboBox1 AnchorSideLeft.Control = ComboBox1
AnchorSideLeft.Side = asrBottom AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = Panel1 AnchorSideTop.Control = Panel1
Left = 501 Left = 489
Height = 22 Height = 22
Top = 7 Top = 7
Width = 138 Width = 129
BorderSpacing.Around = 6 BorderSpacing.Around = 6
Caption = 'Auto fill columns' Caption = 'Auto fill columns'
OnChange = CheckBox2Change OnChange = CheckBox2Change
@ -264,10 +264,10 @@ object RxDBGridMainForm: TRxDBGridMainForm
AnchorSideLeft.Control = CheckBox2 AnchorSideLeft.Control = CheckBox2
AnchorSideLeft.Side = asrBottom AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = Panel1 AnchorSideTop.Control = Panel1
Left = 645 Left = 624
Height = 22 Height = 22
Top = 7 Top = 7
Width = 125 Width = 117
BorderSpacing.Around = 6 BorderSpacing.Around = 6
Caption = 'Show indicator' Caption = 'Show indicator'
Checked = True Checked = True
@ -280,10 +280,10 @@ object RxDBGridMainForm: TRxDBGridMainForm
AnchorSideLeft.Side = asrBottom AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = CheckBox3 AnchorSideTop.Control = CheckBox3
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 645 Left = 624
Height = 22 Height = 22
Top = 35 Top = 35
Width = 123 Width = 114
BorderSpacing.Around = 6 BorderSpacing.Around = 6
Caption = 'Show headers' Caption = 'Show headers'
Checked = True Checked = True

38
components/rx/rxdbgrid.pas
View File

@ -1117,12 +1117,13 @@ end;
procedure TRxDBGrid.CalcTitle; procedure TRxDBGrid.CalcTitle;
var var
i, j:integer; i, j:integer;
H, H1, W, H2:integer; H, H1, W, H2, W1:integer;
rxCol, rxColNext:TRxColumn; rxCol, rxColNext:TRxColumn;
rxTit, rxTitleNext:TRxColumnTitle; rxTit, rxTitleNext:TRxColumnTitle;
MLRec1, P:TMLCaptionItem; MLRec1, P:TMLCaptionItem;
MLRec2:TMLCaptionItem; MLRec2:TMLCaptionItem;
tmpCanvas: TCanvas; tmpCanvas: TCanvas;
S:string;
begin begin
{ TODO -oalexs : need rewrite code - split to 2 step: { TODO -oalexs : need rewrite code - split to 2 step:
1. make links between column 1. make links between column
@ -1206,29 +1207,52 @@ begin
end; end;
//Тут расчёт высоты заголовка каждой колонки - надо обработать слитые заголовки //Тут расчёт высоты заголовка каждой колонки - надо обработать слитые заголовки
{ for i:=0 to Columns.Count-1 do H:=1;
for i:=0 to Columns.Count-1 do
begin begin
rxCol:=TRxColumn(Columns[i]); rxCol:=TRxColumn(Columns[i]);
rxTit:=TRxColumnTitle(rxCol.Title);
H1:=0;
//Не забудем про вертикальную ориентацию
if Assigned(rxCol) and rxCol.Visible then if Assigned(rxCol) and rxCol.Visible then
begin begin
if rxTit.CaptionLinesCount > H then
H:=rxTit.CaptionLinesCount;
for j:=0 to rxTit.CaptionLinesCount-1 do for j:=0 to rxTit.CaptionLinesCount-1 do
begin begin
MLRec1:=rxTit.CaptionLine(j); MLRec1:=rxTit.CaptionLine(j);
S:=MLRec1.Caption;
if not Assigned(MLRec1.Prior) then if not Assigned(MLRec1.Prior) then
begin begin
W:=MLRec1.Width; W:=rxCol.Width;//MLRec1.Width;
P:=MLRec1.Next; P:=MLRec1.Next;
while Assigned(P) do while Assigned(P) do
begin begin
Inc(W, P.Width); Inc(W, P.Col.Width);//P.Width);
P:=P.Next;
end;
W1:=tmpCanvas.TextWidth(MLRec1.Caption)+2;
if W1 > W then
MLRec1.Hegth:= W1 div W + 1
else
MLRec1.Hegth:=1;
P:=MLRec1.Next;
while Assigned(P) do
begin
P.Hegth:=MLRec1.Hegth;
P:=P.Next; P:=P.Next;
end; end;
end; end;
H1:=H1 + MLRec1.Hegth;
end; end;
end; end;
end;}
RowHeights[0] := DefaultRowHeight * ({FTitleLines+}H); if H1 > H then
H:=H1;
end;
RowHeights[0] := DefaultRowHeight * H;
if rdgFilter in OptionsRx then if rdgFilter in OptionsRx then
begin begin
@ -1561,7 +1585,7 @@ begin
end end
else else
begin begin
aRect2.Bottom:=aRect2.Top + DefaultRowHeight; aRect2.Bottom:=aRect2.Top + MLI.Hegth * DefaultRowHeight;
end; end;