paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-06-05 16:58:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Examples: Undo unintentional change in gridexamples/merged_cells by prev commit (r58817)

Browse Source 
git-svn-id: trunk@58818 -
This commit is contained in:
wp 2018-09-02 13:16:06 +00:00
parent 81bf5300aa
commit e01a4c1b40
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/gridexamples/merged_cells/mainform.lfm
View File

@ -5,7 +5,7 @@ object Form1: TForm1
Width = 650 Width = 650
Caption = 'Form1' Caption = 'Form1'
OnCreate = FormCreate OnCreate = FormCreate
LCLVersion = '1.8.4.0' LCLVersion = '1.9.0.0'
object ImageList1: TImageList object ImageList1: TImageList
left = 58 left = 58
top = 45 top = 45

6
examples/gridexamples/merged_cells/mainform.pas
View File

@ -132,7 +132,6 @@ end;
procedure TForm1.MergeCellsHandler(Sender: TObject; ACol, ARow: Integer; procedure TForm1.MergeCellsHandler(Sender: TObject; ACol, ARow: Integer;
var ALeft, ATop, ARight, ABottom: Integer); var ALeft, ATop, ARight, ABottom: Integer);
begin begin
(*
// Define a merged block which is a single row heigh // Define a merged block which is a single row heigh
if (ACol in [1..2]) and (ARow = 1) then begin if (ACol in [1..2]) and (ARow = 1) then begin
ALeft := 1; ALeft := 1;
@ -150,11 +149,10 @@ begin
ALeft := 1; ALeft := 1;
ARight := 2; ARight := 2;
end else end else
*)
// Define a merged block in the row headers (for the vertical text) // Define a merged block in the row headers (for the vertical text)
if (ACol = 0) and (ARow in [2..5]) then begin if (ACol = 0) and (ARow in [2..5]) then begin
ATop := 2; ATop := 2;
ABottom := 5; (* ABottom := 5;
end else end else
// Merge the next two cells adjacent to cell with text 'Image' // Merge the next two cells adjacent to cell with text 'Image'
if (ACol > 1) and (Grid.Cells[ACol-1, ARow] = 'Image') then begin if (ACol > 1) and (Grid.Cells[ACol-1, ARow] = 'Image') then begin
@ -163,7 +161,7 @@ begin
end else end else
if (ACol > 2) and (Grid.Cells[ACol-2, ARow] = 'Image') then begin if (ACol > 2) and (Grid.Cells[ACol-2, ARow] = 'Image') then begin
ALeft := ACol - 1; ALeft := ACol - 1;
ARight := ALeft + 1; *) ARight := ALeft + 1;
end; end;
end; end;