github/msft-calculator
1
0
Fork 0
mirror of https://github.com/Microsoft/calculator.git synced 2025-08-22 06:13:14 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Simplify OnAppPropertyChanged

Browse source 
Use a switch statement instead of else-if
This commit is contained in:
Rose 2022-09-26 10:18:38 -04:00
commit 025518a6fc
1 changed files with 57 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/Calculator/Views/MainPage.xaml.cs
View file

@ -206,14 +206,15 @@ namespace CalculatorApp
KeyboardShortcutManager.DisableShortcuts(false); KeyboardShortcutManager.DisableShortcuts(false);
if (newValue == ViewMode.Standard) switch (newValue)
{ {
case ViewMode.Standard:
EnsureCalculator(); EnsureCalculator();
Model.CalculatorViewModel.HistoryVM.AreHistoryShortcutsEnabled = true; Model.CalculatorViewModel.HistoryVM.AreHistoryShortcutsEnabled = true;
m_calculator.AnimateCalculator(NavCategory.IsConverterViewMode(previousMode)); m_calculator.AnimateCalculator(NavCategory.IsConverterViewMode(previousMode));
Model.CalculatorViewModel.HistoryVM.ReloadHistory(newValue); Model.CalculatorViewModel.HistoryVM.ReloadHistory(newValue);
} break;
else if (newValue == ViewMode.Scientific) case ViewMode.Scientific:
{ {
EnsureCalculator(); EnsureCalculator();
Model.CalculatorViewModel.HistoryVM.AreHistoryShortcutsEnabled = true; Model.CalculatorViewModel.HistoryVM.AreHistoryShortcutsEnabled = true;
@ -223,8 +224,9 @@ namespace CalculatorApp
} }
Model.CalculatorViewModel.HistoryVM.ReloadHistory(newValue); Model.CalculatorViewModel.HistoryVM.ReloadHistory(newValue);
break;
} }
else if (newValue == ViewMode.Programmer) case ViewMode.Programmer:
{ {
Model.CalculatorViewModel.HistoryVM.AreHistoryShortcutsEnabled = false; Model.CalculatorViewModel.HistoryVM.AreHistoryShortcutsEnabled = false;
EnsureCalculator(); EnsureCalculator();
@ -232,8 +234,16 @@ namespace CalculatorApp
{ {
m_calculator.AnimateCalculator(NavCategory.IsConverterViewMode(previousMode)); m_calculator.AnimateCalculator(NavCategory.IsConverterViewMode(previousMode));
} }
break;
} }
else if (NavCategory.IsDateCalculatorViewMode(newValue)) case ViewMode.Graphing:
EnsureGraphingCalculator();
KeyboardShortcutManager.DisableShortcuts(true);
break;
default:
{
if (NavCategory.IsDateCalculatorViewMode(newValue))
{ {
if (Model.CalculatorViewModel != null) if (Model.CalculatorViewModel != null)
{ {
@ -241,11 +251,6 @@ namespace CalculatorApp
} }
EnsureDateCalculator(); EnsureDateCalculator();
} }
else if (newValue == ViewMode.Graphing)
{
EnsureGraphingCalculator();
KeyboardShortcutManager.DisableShortcuts(true);
}
else if (NavCategory.IsConverterViewMode(newValue)) else if (NavCategory.IsConverterViewMode(newValue))
{ {
if (Model.CalculatorViewModel != null) if (Model.CalculatorViewModel != null)
@ -260,6 +265,10 @@ namespace CalculatorApp
} }
} }
break;
}
}
ShowHideControls(newValue); ShowHideControls(newValue);
UpdateViewState(); UpdateViewState();