paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-12-11 10:00:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

LCL/SpinEdit: Do not store default MinValue in lfm.

Browse Source 
git-svn-id: trunk@64335 -
This commit is contained in:
wp 2021-01-04 19:45:25 +00:00
parent a25bbfe7d2
commit 858cdf7813
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
components/lazcontrols/spinex.inc
View File

@ -202,7 +202,12 @@ end;
function TSpinEditExBase.MaxValueStored: Boolean;
begin
Result := true; //not SameValue(FMaxValue, DefMaxValue);
Result := true;
end;
function TSpinEditExBase.MinValueStored: Boolean;
begin
Result := true;
end;
procedure TSpinEditExBase.EditMouseWheelUp(Shift: TShiftState;
@ -323,6 +328,7 @@ begin
FArrowKeys := True;
FIncrement := DefIncrement;
FMaxValue := DefMaxValue;
FMinValue := DefMinValue;
FUpdatePending := True;
FSettingValue := False;
FNullValueBehaviour := nvbMinValue;
@ -482,6 +488,11 @@ begin
Result := not SameValue(FMaxValue, DefMaxValue);
end;
function TCustomFloatSpinEditEx.MinValueStored: Boolean;
begin
Result := not SameValue(FMinValue, DefMinValue);
end;
function TCustomFloatSpinEditEx.TextIsNumber(const S: String; out ANumber: Double
): Boolean;
begin
@ -625,12 +636,17 @@ end;
function TCustomSpinEditEx.IncrementStored: Boolean;
begin
Result := not SameValue(FIncrement, DefIncrement);
Result := FIncrement <> DefIncrement;
end;
function TCustomSpinEditEx.MaxValueStored: Boolean;
begin
Result := not SameValue(FMaxValue, DefMaxValue);
Result := FMaxValue <> DefMaxValue;
end;
function TCustomSpinEditEx.MinValueStored: Boolean;
begin
Result := FMinValue <> DefMinValue;
end;
procedure TCustomSpinEditEx.SetThousandSeparator(AValue: String);

6
components/lazcontrols/spinex.pp
View File

@ -100,6 +100,7 @@ type
private const
DefIncrement = 1;
DefMaxValue = 100;
DefMinValue = 0;
DefMinRepeatValue = 100;
private
FArrowKeys: Boolean;
@ -136,6 +137,7 @@ type
procedure EditMouseWheelDown(Shift: TShiftState; MousePos: TPoint; var Handled: Boolean); override;
function IncrementStored: Boolean; virtual;
function MaxValueStored: Boolean; virtual;
function MinValueStored: Boolean; virtual;
function SafeInc(AValue: T): T; virtual; abstract;
function SafeDec(AValue: T): T; virtual abstract;
procedure SetValue(const AValue: T); virtual;
@ -166,7 +168,7 @@ type
function Utf8KeyAllowed({%H-}Key: TUTF8Char): Boolean; virtual;
public
property Increment: T read FIncrement write SetIncrement stored IncrementStored nodefault;
property MinValue: T read FMinValue write SetMinValue;
property MinValue: T read FMinValue write SetMinValue stored MinValueStored nodefault;
property MaxValue: T read FMaxValue write SetMaxValue stored MaxValueStored nodefault;
property NullValue: T read GetNullValue write SetNullValue;
property NullValueBehaviour: TNullValueBehaviour read FNullValueBehaviour write FNullValueBehaviour default nvbMinValue;
@ -204,6 +206,7 @@ type
procedure EditKeyPress(var Key: char); override;
function IncrementStored: Boolean; override;
function MaxValuestored: Boolean; override;
function MinValuestored: Boolean; override;
function TextIsNumber(const S: String; out ANumber: Double): Boolean; override;
function SafeInc(AValue: Double): Double; override;
function SafeDec(AValue: Double): Double; override;
@ -318,6 +321,7 @@ type
protected
function IncrementStored: Boolean; override;
function MaxValuestored: Boolean; override;
function MinValuestored: Boolean; override;
function SafeInc(AValue: Int64): Int64; override;
function SafeDec(AValue: Int64): Int64; override;
function TextIsNumber(const S: String; out ANumber: Int64): Boolean; override;