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

jvcllaz: Fix form autosizing in JvYearGrid demo for Linux.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6996 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2019-06-02 10:36:18 +00:00
parent c2853e1f44
commit 793dbc12ab
4 changed files with 1885 additions and 2911 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4726
components/jvcllaz/examples/JvWizard/uformmain.lfm
View File

File diff suppressed because it is too large Load Diff

59
components/jvcllaz/examples/JvYearGrid/main.lfm
View File

@ -1,14 +1,13 @@
object MainForm: TMainForm object MainForm: TMainForm
Left = 361 Left = 361
Height = 371 Height = 546
Top = 215 Top = 215
Width = 885 Width = 1310
AutoSize = True AutoSize = True
Caption = 'JvYearGrid Demo' Caption = 'JvYearGrid Demo'
ClientHeight = 371 ClientHeight = 546
ClientWidth = 885 ClientWidth = 1310
OnCreate = FormCreate OnCreate = FormCreate
OnShow = FormShow
LCLVersion = '2.1.0.0' LCLVersion = '2.1.0.0'
object JvYearGrid1: TJvYearGrid object JvYearGrid1: TJvYearGrid
AnchorSideLeft.Control = Owner AnchorSideLeft.Control = Owner
@ -100,21 +99,23 @@ object MainForm: TMainForm
Left = 0 Left = 0
Height = 97 Height = 97
Top = 264 Top = 264
Width = 722 Width = 730
AutoSize = True AutoSize = True
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 97 ClientHeight = 97
ClientWidth = 722 ClientWidth = 730
ParentFont = False ParentFont = False
TabOrder = 1 TabOrder = 1
object EdLeftMargin: TSpinEdit object EdLeftMargin: TSpinEdit
AnchorSideLeft.Control = Panel1
AnchorSideTop.Control = EdTopMargin AnchorSideTop.Control = EdTopMargin
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 16 AnchorSideRight.Control = Label4
AnchorSideRight.Side = asrBottom
Left = 24
Height = 23 Height = 23
Top = 31 Top = 31
Width = 50 Width = 50
Anchors = [akTop, akRight]
BorderSpacing.Left = 16 BorderSpacing.Left = 16
BorderSpacing.Top = 4 BorderSpacing.Top = 4
OnChange = EdLeftMarginChange OnChange = EdLeftMarginChange
@ -125,7 +126,7 @@ object MainForm: TMainForm
AnchorSideLeft.Control = EdTopMargin AnchorSideLeft.Control = EdTopMargin
AnchorSideLeft.Side = asrBottom AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = EdLeftMargin AnchorSideTop.Control = EdLeftMargin
Left = 136 Left = 144
Height = 23 Height = 23
Top = 31 Top = 31
Width = 50 Width = 50
@ -138,7 +139,7 @@ object MainForm: TMainForm
AnchorSideLeft.Control = EdLeftMargin AnchorSideLeft.Control = EdLeftMargin
AnchorSideLeft.Side = asrBottom AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = Panel1 AnchorSideTop.Control = Panel1
Left = 74 Left = 82
Height = 23 Height = 23
Top = 4 Top = 4
Width = 58 Width = 58
@ -152,7 +153,7 @@ object MainForm: TMainForm
AnchorSideLeft.Control = EdTopMargin AnchorSideLeft.Control = EdTopMargin
AnchorSideTop.Control = EdLeftMargin AnchorSideTop.Control = EdLeftMargin
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 74 Left = 82
Height = 23 Height = 23
Top = 58 Top = 58
Width = 58 Width = 58
@ -165,7 +166,7 @@ object MainForm: TMainForm
AnchorSideLeft.Control = Label1 AnchorSideLeft.Control = Label1
AnchorSideLeft.Side = asrBottom AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = EdTopMargin AnchorSideTop.Control = EdTopMargin
Left = 406 Left = 414
Height = 23 Height = 23
Top = 4 Top = 4
Width = 100 Width = 100
@ -186,7 +187,7 @@ object MainForm: TMainForm
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = Label2 AnchorSideRight.Control = Label2
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 242 Left = 250
Height = 15 Height = 15
Top = 8 Top = 8
Width = 156 Width = 156
@ -202,7 +203,7 @@ object MainForm: TMainForm
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = Label1 AnchorSideRight.Control = Label1
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 226 Left = 234
Height = 15 Height = 15
Top = 35 Top = 35
Width = 172 Width = 172
@ -217,7 +218,7 @@ object MainForm: TMainForm
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = cmbDayNamesAlignment AnchorSideRight.Control = cmbDayNamesAlignment
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 406 Left = 414
Height = 23 Height = 23
Top = 31 Top = 31
Width = 100 Width = 100
@ -239,7 +240,7 @@ object MainForm: TMainForm
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = Label1 AnchorSideRight.Control = Label1
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 316 Left = 324
Height = 15 Height = 15
Top = 62 Top = 62
Width = 82 Width = 82
@ -254,7 +255,7 @@ object MainForm: TMainForm
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = cmbDayNamesAlignment AnchorSideRight.Control = cmbDayNamesAlignment
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 406 Left = 414
Height = 23 Height = 23
Top = 58 Top = 58
Width = 100 Width = 100
@ -276,7 +277,7 @@ object MainForm: TMainForm
AnchorSideLeft.Control = lblYear AnchorSideLeft.Control = lblYear
AnchorSideTop.Control = cmbMonthFormat AnchorSideTop.Control = cmbMonthFormat
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
Left = 640 Left = 648
Height = 19 Height = 19
Top = 33 Top = 33
Width = 39 Width = 39
@ -290,7 +291,7 @@ object MainForm: TMainForm
AnchorSideLeft.Control = cmbDayNamesAlignment AnchorSideLeft.Control = cmbDayNamesAlignment
AnchorSideLeft.Side = asrBottom AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = cmbDayNamesAlignment AnchorSideTop.Control = cmbDayNamesAlignment
Left = 514 Left = 522
Height = 23 Height = 23
Top = 4 Top = 4
Width = 100 Width = 100
@ -310,7 +311,7 @@ object MainForm: TMainForm
AnchorSideLeft.Control = cmbDayNamesAlignment AnchorSideLeft.Control = cmbDayNamesAlignment
AnchorSideLeft.Side = asrBottom AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = cmbMonthNamesAlignment AnchorSideTop.Control = cmbMonthNamesAlignment
Left = 514 Left = 522
Height = 23 Height = 23
Top = 31 Top = 31
Width = 100 Width = 100
@ -331,7 +332,7 @@ object MainForm: TMainForm
AnchorSideTop.Control = cmbDayFormat AnchorSideTop.Control = cmbDayFormat
AnchorSideBottom.Control = cmbDayFormat AnchorSideBottom.Control = cmbDayFormat
AnchorSideBottom.Side = asrBottom AnchorSideBottom.Side = asrBottom
Left = 665 Left = 673
Height = 23 Height = 23
Top = 4 Top = 4
Width = 57 Width = 57
@ -349,7 +350,7 @@ object MainForm: TMainForm
AnchorSideLeft.Side = asrBottom AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = cmbDayFormat AnchorSideTop.Control = cmbDayFormat
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
Left = 640 Left = 648
Height = 15 Height = 15
Top = 8 Top = 8
Width = 22 Width = 22
@ -358,5 +359,17 @@ object MainForm: TMainForm
ParentColor = False ParentColor = False
ParentFont = False ParentFont = False
end end
object Label4: TLabel
AnchorSideLeft.Control = Panel1
AnchorSideTop.Control = EdTopMargin
AnchorSideTop.Side = asrCenter
Left = 8
Height = 15
Top = 8
Width = 66
BorderSpacing.Left = 8
Caption = 'Cell margins'
ParentColor = False
end
end end
end end

8
components/jvcllaz/examples/JvYearGrid/main.pas
View File

@ -28,6 +28,7 @@ type
Label1: TLabel; Label1: TLabel;
Label2: TLabel; Label2: TLabel;
Label3: TLabel; Label3: TLabel;
Label4: TLabel;
lblYear: TLabel; lblYear: TLabel;
Panel1: TPanel; Panel1: TPanel;
udYear: TUpDown; udYear: TUpDown;
@ -42,7 +43,6 @@ type
procedure EdRightMarginChange(Sender: TObject); procedure EdRightMarginChange(Sender: TObject);
procedure EdTopMarginChange(Sender: TObject); procedure EdTopMarginChange(Sender: TObject);
procedure FormCreate(Sender: TObject); procedure FormCreate(Sender: TObject);
procedure FormShow(Sender: TObject);
procedure udYearClick(Sender: TObject; Button: TUDBtnType); procedure udYearClick(Sender: TObject; Button: TUDBtnType);
private private
@ -126,17 +126,13 @@ begin
cmbDaysAlignment.ItemIndex := ord(JvYearGrid1.DaysAlignment); cmbDaysAlignment.ItemIndex := ord(JvYearGrid1.DaysAlignment);
cmbDayFormat.ItemIndex := ord(JvYearGrid1.DayFormat); cmbDayFormat.ItemIndex := ord(JvYearGrid1.DayFormat);
cmbMonthFormat.ItemIndex := ord(JvYearGrid1.MonthFormat); cmbMonthFormat.ItemIndex := ord(JvYearGrid1.MonthFormat);
cmbMonthFormatChange(nil);
udYear.Position := JvYearGrid1.Year; udYear.Position := JvYearGrid1.Year;
CbFlat.Checked := JvYearGrid1.Flat; CbFlat.Checked := JvYearGrid1.Flat;
end; end;
procedure TMainForm.FormShow(Sender: TObject);
begin
AutoSize := true;
end;
procedure TMainForm.udYearClick(Sender: TObject; Button: TUDBtnType); procedure TMainForm.udYearClick(Sender: TObject; Button: TUDBtnType);
begin begin
JvYearGrid1.Year := udYear.Position; JvYearGrid1.Year := udYear.Position;

3
components/jvcllaz/run/JvWizard/jvwizardcommon.pas
View File

@ -213,8 +213,11 @@ begin
end; end;
Inc(AWidth, AGraphic.Width); Inc(AWidth, AGraphic.Width);
end; end;
ACanvas.Draw(ARect.Left, ARect.Top, Bmp);
{
BitBlt(ACanvas.Handle, ARect.Left, ARect.Top, Bmp.Width, Bmp.Height, BitBlt(ACanvas.Handle, ARect.Left, ARect.Top, Bmp.Width, Bmp.Height,
Bmp.Canvas.Handle, 0, 0, SRCCOPY); Bmp.Canvas.Handle, 0, 0, SRCCOPY);
}
finally finally
Bmp.Free; Bmp.Free;
end; end;