paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-07 03:20:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

DateTimePicker - improve smart calling change when Date/Time is set from code

Browse Source 
git-svn-id: trunk@55266 -
This commit is contained in:
zoran 2017-06-07 15:56:49 +00:00
parent 26d1063cd6
commit ee969afadb
1 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
components/datetimectrls/datetimepicker.pas
View File

@ -298,7 +298,7 @@ type
procedure SelectTextPartUnderMouse(XMouse: Integer);
procedure MouseDown(Button: TMouseButton; Shift: TShiftState; X, Y: Integer); override;
function DoMouseWheel(Shift: TShiftState; WheelDelta: Integer; MousePos: TPoint): Boolean; override;
procedure UpdateDate; virtual;
procedure UpdateDate(const CallChangeFromSetDateTime: Boolean = False); virtual;
procedure DoEnter; override;
procedure DoExit; override;
procedure Click; override;
@ -1066,29 +1066,17 @@ begin
end;
procedure TCustomDateTimePicker.SetDateTime(const AValue: TDateTime);
var
CallChange: Boolean;
begin
if not EqualDateTime(AValue, FDateTime) then begin
if IsNullDate(AValue) then
FDateTime := NullDate
else
FDateTime := AValue;
CallChange := dtpoDoChangeOnSetDateTime in FOptions;
end else
CallChange := False;
if CallChange then
begin
Change;
Inc(FSkipChangeInUpdateDate);
end;
try
UpdateDate(dtpoDoChangeOnSetDateTime in FOptions);
end else
UpdateDate;
finally
if CallChange then
Dec(FSkipChangeInUpdateDate);
end;
end;
procedure TCustomDateTimePicker.SetDateSeparator(const AValue: String);
@ -2777,7 +2765,7 @@ begin
SetHMSMs(HMSMs);
end;
procedure TCustomDateTimePicker.UpdateDate;
procedure TCustomDateTimePicker.UpdateDate(const CallChangeFromSetDateTime: Boolean);
var
W: Array[1..3] of Word;
WT: Array[dtpHour..dtpAMPM] of Word;
@ -2801,15 +2789,19 @@ begin
// and in recursive calls which could be made through calling Change
Inc(FSkipChangeInUpdateDate);
try
if FUserChanging > 0 then begin // this means that the change is caused by user interaction
if (FUserChanging > 0) // the change is caused by user interaction
or CallChangeFromSetDateTime // call from SetDateTime with option dtpoDoChangeOnSetDateTime
then
try
Change;
except
UndoChanges;
raise;
end
end else
end;
if FUserChanging = 0 then
FConfirmedDateTime := FDateTime;
finally
Dec(FSkipChangeInUpdateDate);
end;