paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-16 23:49:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

datetimectrls: TDateTimePicker: using local var

Browse Source
This commit is contained in:
mattias 2024-06-05 14:38:21 +02:00
parent f501addc89
commit 8a144ec93d
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
components/datetimectrls/datetimepicker.pas
View File

@ -313,7 +313,7 @@ type
procedure ConfirmChanges; virtual; procedure ConfirmChanges; virtual;
procedure UndoChanges; virtual; procedure UndoChanges; virtual;
procedure DropDownCalendarForm; procedure DropDownCalendarForm; virtual;
function GetCheckBoxRect(IgnoreRightToLeft: Boolean = False): TRect; function GetCheckBoxRect(IgnoreRightToLeft: Boolean = False): TRect;
function GetDateTimePartFromTextPart(TextPart: TTextPart): TDateTimePart; function GetDateTimePartFromTextPart(TextPart: TTextPart): TDateTimePart;
@ -454,6 +454,7 @@ type
property CalAlignment: TDTCalAlignment read FCalAlignment write SetCalAlignment default dtaDefault; property CalAlignment: TDTCalAlignment read FCalAlignment write SetCalAlignment default dtaDefault;
property Alignment: TAlignment read FAlignment write SetAlignment default taLeftJustify; property Alignment: TAlignment read FAlignment write SetAlignment default taLeftJustify;
property Options: TDateTimePickerOptions read FOptions write SetOptions default cDefOptions; property Options: TDateTimePickerOptions read FOptions write SetOptions default cDefOptions;
property CalendarForm: TCustomForm read FCalendarForm;
public public
constructor Create(AOwner: TComponent); override; constructor Create(AOwner: TComponent); override;
destructor Destroy; override; destructor Destroy; override;
@ -913,6 +914,7 @@ constructor TDTCalendarForm.CreateNewDTCalendarForm(AOwner: TComponent;
var var
P: TPoint; P: TPoint;
CalClass: TCalendarControlWrapperClass; CalClass: TCalendarControlWrapperClass;
CalControl: TControl;
begin begin
inherited CreateNew(AOwner); inherited CreateNew(AOwner);
@ -942,11 +944,12 @@ begin
Cal := CalClass.Create; Cal := CalClass.Create;
Cal.GetCalendarControl.ParentBiDiMode := True; CalControl:=Cal.GetCalendarControl;
Cal.GetCalendarControl.AutoSize := True; CalControl.ParentBiDiMode := True;
Cal.GetCalendarControl.GetPreferredSize(P.x, P.y); CalControl.AutoSize := True;
Cal.GetCalendarControl.Align := alNone; CalControl.GetPreferredSize(P.x, P.y);
Cal.GetCalendarControl.SetBounds(1, 1, P.x, P.y); CalControl.Align := alNone;
CalControl.SetBounds(1, 1, P.x, P.y);
SetBounds(-8000, -8000, P.x + 2, P.y + 2); SetBounds(-8000, -8000, P.x + 2, P.y + 2);
RememberedCalendarFormOrigin := Point(-8000, -8000); RememberedCalendarFormOrigin := Point(-8000, -8000);
@ -968,17 +971,17 @@ begin
else else
Cal.SetDate(DTPicker.Date); Cal.SetDate(DTPicker.Date);
Cal.GetCalendarControl.OnResize := @CalendarResize; CalControl.OnResize := @CalendarResize;
Cal.GetCalendarControl.OnClick := @CalendarClick; CalControl.OnClick := @CalendarClick;
if Cal.GetCalendarControl is TWinControl then begin if CalControl is TWinControl then begin
TWinControl(Cal.GetCalendarControl).TabStop := True; TWinControl(CalControl).TabStop := True;
TWinControl(Cal.GetCalendarControl).SetFocus; TWinControl(CalControl).SetFocus;
end; end;
Self.KeyPreview := True; Self.KeyPreview := True;
Shape.Parent := Self; Shape.Parent := Self;
Cal.GetCalendarControl.Parent := Self; CalControl.Parent := Self;
Cal.GetCalendarControl.BringToFront; CalControl.BringToFront;
end; end;
destructor TDTCalendarForm.Destroy; destructor TDTCalendarForm.Destroy;