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

LCL: Refactoring. Make TCalculatorDialog.Execute more understandable by removing a "with" block.

Browse Source 
git-svn-id: trunk@36659 -
This commit is contained in:
juha 2012-04-08 07:57:02 +00:00
parent 7165993ff0
commit bd7ff78718
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
lcl/extdlgs.pas
View File

@ -184,7 +184,7 @@ type
property DisplayLabel: TLabel read FDisplayLabel;
public
constructor Create(AOwner: TComponent); override;
constructor CreateLayout(AOwner: TComponent;ALayout : TCalculatorLayout);
// constructor CreateLayout(AOwner: TComponent;ALayout : TCalculatorLayout);
property Value : Double read GetValue write SetValue;
end;
@ -1052,33 +1052,35 @@ begin
end;
function TCalculatorDialog.Execute: Boolean;
var
CPanel: TCalculatorPanel;
begin
FCalc:=CreateCalculatorForm(Self, FLayout, HelpContext);
with FCalc do
try
Caption:=Self.Title;
TCalculatorPanel(FCalcPanel).FMemory:=Self.FMemory;
TCalculatorPanel(FCalcPanel).UpdateMemoryLabel;
If Self.Precision>2 then
TCalculatorPanel(FCalcPanel).FPrecision:=Self.Precision
CPanel:=TCalculatorPanel(FCalc.FCalcPanel);
FCalc.Caption:=Title;
CPanel.FMemory:=FMemory;
CPanel.UpdateMemoryLabel;
If Precision>2 then
CPanel.FPrecision:=Precision
else
TCalculatorPanel(FCalcPanel).FPrecision:=2;
TCalculatorPanel(FCalcPanel).FBeepOnError:=Self.BeepOnError;
if Self.FValue <> 0 then begin
TCalculatorPanel(FCalcPanel).DisplayValue:=Self.FValue;
TCalculatorPanel(FCalcPanel).FStatus:=csFirst;
TCalculatorPanel(FCalcPanel).FOperator:='=';
CPanel.FPrecision:=2;
CPanel.FBeepOnError:=BeepOnError;
if FValue <> 0 then begin
CPanel.DisplayValue:=FValue;
CPanel.FStatus:=csFirst;
CPanel.FOperator:='=';
end;
Result:=(ShowModal = mrOk);
Result := (FCalc.ShowModal = mrOk);
if Result then begin
Self.FMemory:=TCalculatorPanel(FCalcPanel).FMemory;
if (TCalculatorPanel(FCalcPanel).DisplayValue <> Self.FValue) then begin
Self.FValue:=TCalculatorPanel(FCalcPanel).DisplayValue;
FMemory:=CPanel.FMemory;
if CPanel.DisplayValue <> FValue then begin
FValue:=CPanel.DisplayValue;
Change;
end;
end;
finally
Free;
FCalc.Free;
FCalc:=nil;
end;
end;
@ -1086,23 +1088,21 @@ end;
{ TCalculatorForm }
constructor TCalculatorForm.Create(AOwner: TComponent);
begin
BeginFormUpdate;
inherited CreateNew(AOwner, 0);
InitForm(clNormal);
EndFormUpdate;
end;
{
constructor TCalculatorForm.CreateLayout(AOwner: TComponent;ALayout : TCalculatorLayout);
begin
BeginFormUpdate;
inherited CreateNew(AOwner, 0);
InitForm(ALayout);
EndFormUpdate;
end;
}
procedure TCalculatorForm.InitForm(ALayout : TCalculatorLayout);
begin