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

Revert NegativeDisplayFormat because functionality is ready in DisplayFormat mask positive;negative;zero

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5632 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
jujibo
2017-01-12 09:08:34 +00:00
parent a2825db869
commit a3d3ce9f37
1 changed files with 3 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
components/jujiboutils/src/jlabeledcurrencyedit.pas
View File

@ -36,11 +36,9 @@ type
fPColor: TColor; fPColor: TColor;
theValue: currency; theValue: currency;
fFormat: string; fFormat: string;
fNFormat: string;
fDecimals: integer; fDecimals: integer;
function getDecimals: integer; function getDecimals: integer;
function getFormat: string; function getFormat: string;
function getNegativeFormat: string;
function getValue: currency; function getValue: currency;
procedure formatInput; procedure formatInput;
procedure setDecimals(const AValue: integer); procedure setDecimals(const AValue: integer);
@ -48,7 +46,6 @@ type
function scaleTo(const AValue: currency; const NDecimals: integer): currency; function scaleTo(const AValue: currency; const NDecimals: integer): currency;
function IsValidFloat(const Value: string): boolean; function IsValidFloat(const Value: string): boolean;
procedure setNegativeColor(AValue: TColor); procedure setNegativeColor(AValue: TColor);
procedure setNegativeFormat(AValue: string);
procedure setValue(const AValue: currency); procedure setValue(const AValue: currency);
protected protected
{ Protected declarations } { Protected declarations }
@ -65,8 +62,6 @@ type
property EditFormat: string read fEFormat write fEFormat; property EditFormat: string read fEFormat write fEFormat;
property Decimals: integer read getDecimals write setDecimals; property Decimals: integer read getDecimals write setDecimals;
property Value: currency read getValue write setValue; property Value: currency read getValue write setValue;
property NegativeDisplayFormat: string read getNegativeFormat
write setNegativeFormat;
property NegativeColor: TColor read fNColor write setNegativeColor; property NegativeColor: TColor read fNColor write setNegativeColor;
property Action; property Action;
@ -143,11 +138,6 @@ begin
Result := fFormat; Result := fFormat;
end; end;
function TJLabeledCurrencyEdit.getNegativeFormat: string;
begin
Result := fNFormat;
end;
function TJLabeledCurrencyEdit.getValue: currency; function TJLabeledCurrencyEdit.getValue: currency;
begin begin
Result := theValue; Result := theValue;
@ -157,17 +147,11 @@ procedure TJLabeledCurrencyEdit.formatInput;
begin begin
if Font.Color <> fNColor then if Font.Color <> fNColor then
fPColor := Font.Color; // store original font color fPColor := Font.Color; // store original font color
if (theValue < 0) and (fNFormat <> '') then
begin
Caption := FormatFloat(fNFormat, -theValue);
font.Color := fNColor;
end
else
begin
Caption := FormatFloat(DisplayFormat, theValue); Caption := FormatFloat(DisplayFormat, theValue);
if theValue < 0 then
font.Color := fNColor
else
font.Color := fPColor; font.Color := fPColor;
end;
end; end;
procedure TJLabeledCurrencyEdit.setDecimals(const AValue: integer); procedure TJLabeledCurrencyEdit.setDecimals(const AValue: integer);
@ -204,12 +188,6 @@ begin
formatInput; formatInput;
end; end;
procedure TJLabeledCurrencyEdit.setNegativeFormat(AValue: string);
begin
fNFormat := AValue;
formatInput;
end;
procedure TJLabeledCurrencyEdit.setValue(const AValue: currency); procedure TJLabeledCurrencyEdit.setValue(const AValue: currency);
begin begin
if fDecimals > 0 then if fDecimals > 0 then