From db7f3c587e2260394826ce791b4f2edfedd53320 Mon Sep 17 00:00:00 2001 From: Rudy Huyn Date: Wed, 3 Apr 2019 21:44:20 -0700 Subject: [PATCH] reformatting --- src/Calculator/Views/Calculator.xaml.cpp | 11 +++++------ src/Calculator/Views/UnitConverter.xaml | 3 +-- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/Calculator/Views/Calculator.xaml.cpp b/src/Calculator/Views/Calculator.xaml.cpp index f248b3b6..30e25c2a 100644 --- a/src/Calculator/Views/Calculator.xaml.cpp +++ b/src/Calculator/Views/Calculator.xaml.cpp @@ -42,10 +42,10 @@ DEPENDENCY_PROPERTY_INITIALIZATION(Calculator, IsScientific); DEPENDENCY_PROPERTY_INITIALIZATION(Calculator, IsProgrammer); Calculator::Calculator() : - m_doAnimate(false), - m_isLastAnimatedInScientific(false), - m_isLastAnimatedInProgrammer(false), - m_resultAnimate(false) +m_doAnimate(false), +m_isLastAnimatedInScientific(false), +m_isLastAnimatedInProgrammer(false), +m_resultAnimate(false) { SetFontSizeResources(); InitializeComponent(); @@ -192,7 +192,7 @@ void Calculator::UpdateViewState() state = L"Scientific"; Model->IsDecimalEnabled = true; ResultsMVisualStateTrigger->MinWindowHeight = 544; - } + } else { state = L"Standard"; @@ -633,7 +633,6 @@ void Calculator::EnableMemoryControls(bool enable) void Calculator::EnableControls(bool enable) { OpsPanel->IsEnabled = enable; - EnableMemoryControls(enable); } diff --git a/src/Calculator/Views/UnitConverter.xaml b/src/Calculator/Views/UnitConverter.xaml index 472e1aa3..71e1137b 100644 --- a/src/Calculator/Views/UnitConverter.xaml +++ b/src/Calculator/Views/UnitConverter.xaml @@ -1,4 +1,4 @@ - -