diff --git a/Controller/CaculatorController.cs b/Controller/CaculatorController.cs index 268cfa7..612b414 100644 --- a/Controller/CaculatorController.cs +++ b/Controller/CaculatorController.cs @@ -97,7 +97,7 @@ public class CaculatorController { if (_data.Caculated) { - Clear(full: false); + Clear(full: true); } _data.Input = _inputService.TryInput(_data.Input + obj); diff --git a/Form1.cs b/Form1.cs index aca05e3..074e7e4 100644 --- a/Form1.cs +++ b/Form1.cs @@ -158,7 +158,7 @@ namespace calculator private void OnSqrtYButtonClick(object sender, EventArgs e) { - SingleOperatorPressed?.Invoke(Operation.SqrtY); + OperatorPressed?.Invoke(Operation.SqrtY); } private void OnEqualButtonClick(object sender, EventArgs e) @@ -173,7 +173,7 @@ namespace calculator private void OnModButtonClick(object sender, EventArgs e) { - + OperatorPressed?.Invoke(Operation.Mod); } private void OnCubeRootButtonClick(object sender, EventArgs e) @@ -188,7 +188,7 @@ namespace calculator private void OnPowYButtonClick(object sender, EventArgs e) { - SingleOperatorPressed?.Invoke(Operation.PowY); + OperatorPressed?.Invoke(Operation.PowY); } private void OnCubeButtonClick(object sender, EventArgs e) @@ -220,5 +220,6 @@ namespace calculator { SingleOperatorPressed?.Invoke(Operation.Pi); } + } } \ No newline at end of file diff --git a/Form1.resx b/Form1.resx index 0c27f79..2a5f517 100644 --- a/Form1.resx +++ b/Form1.resx @@ -123,61 +123,61 @@ True - + True - + True - + True True - + True - + True - + True - + True - + True - + True - + True - + True - + True - + True - + True - + True - + True - + True - + True @@ -186,10 +186,10 @@ True - + True - + True @@ -291,15 +291,6 @@ True - - True - - - True - - - True - True