github/msft-calculator
1
0
Fork 0
mirror of https://github.com/Microsoft/calculator.git synced 2025-07-30 19:40:00 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Simplify OnAppPropertyChanged (#1914)

Browse source 
Use a switch statement instead of else-if
This commit is contained in:
Rose 2022-09-28 20:07:07 -04:00 • committed by GitHub
parent 35f4d7e75a
commit be5c839bcf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 48 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -206,34 +206,37 @@ 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;
if (Model.PreviousMode != ViewMode.Scientific) if (Model.PreviousMode != ViewMode.Scientific)
{ {
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.Programmer) case ViewMode.Programmer:
{
Model.CalculatorViewModel.HistoryVM.AreHistoryShortcutsEnabled = false; Model.CalculatorViewModel.HistoryVM.AreHistoryShortcutsEnabled = false;
EnsureCalculator(); EnsureCalculator();
if (Model.PreviousMode != ViewMode.Programmer) if (Model.PreviousMode != ViewMode.Programmer)
{ {
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 +244,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)
@ -259,6 +257,8 @@ namespace CalculatorApp
m_converter.AnimateConverter(); m_converter.AnimateConverter();
} }
} }
break;
}
ShowHideControls(newValue); ShowHideControls(newValue);