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

Fix formatting

Browse source
This commit is contained in:
Rose 2022-09-28 09:17:26 -04:00
commit ce44453779
1 changed files with 29 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -215,58 +215,49 @@ namespace CalculatorApp
Model.CalculatorViewModel.HistoryVM.ReloadHistory(newValue); Model.CalculatorViewModel.HistoryVM.ReloadHistory(newValue);
break; break;
case ViewMode.Scientific: case ViewMode.Scientific:
EnsureCalculator();
Model.CalculatorViewModel.HistoryVM.AreHistoryShortcutsEnabled = true;
if (Model.PreviousMode != ViewMode.Scientific)
{ {
EnsureCalculator(); m_calculator.AnimateCalculator(NavCategory.IsConverterViewMode(previousMode));
Model.CalculatorViewModel.HistoryVM.AreHistoryShortcutsEnabled = true;
if (Model.PreviousMode != ViewMode.Scientific)
{
m_calculator.AnimateCalculator(NavCategory.IsConverterViewMode(previousMode));
}
Model.CalculatorViewModel.HistoryVM.ReloadHistory(newValue);
break;
} }
Model.CalculatorViewModel.HistoryVM.ReloadHistory(newValue);
break;
case ViewMode.Programmer: case ViewMode.Programmer:
Model.CalculatorViewModel.HistoryVM.AreHistoryShortcutsEnabled = false;
EnsureCalculator();
if (Model.PreviousMode != ViewMode.Programmer)
{ {
Model.CalculatorViewModel.HistoryVM.AreHistoryShortcutsEnabled = false; m_calculator.AnimateCalculator(NavCategory.IsConverterViewMode(previousMode));
EnsureCalculator();
if (Model.PreviousMode != ViewMode.Programmer)
{
m_calculator.AnimateCalculator(NavCategory.IsConverterViewMode(previousMode));
}
break;
} }
break;
case ViewMode.Graphing: case ViewMode.Graphing:
EnsureGraphingCalculator(); EnsureGraphingCalculator();
KeyboardShortcutManager.DisableShortcuts(true); KeyboardShortcutManager.DisableShortcuts(true);
break; break;
default: default:
if (NavCategory.IsDateCalculatorViewMode(newValue))
{ {
if (NavCategory.IsDateCalculatorViewMode(newValue)) if (Model.CalculatorViewModel != null)
{ {
if (Model.CalculatorViewModel != null) Model.CalculatorViewModel.HistoryVM.AreHistoryShortcutsEnabled = false;
{
Model.CalculatorViewModel.HistoryVM.AreHistoryShortcutsEnabled = false;
}
EnsureDateCalculator();
} }
else if (NavCategory.IsConverterViewMode(newValue)) EnsureDateCalculator();
{
if (Model.CalculatorViewModel != null)
{
Model.CalculatorViewModel.HistoryVM.AreHistoryShortcutsEnabled = false;
}
EnsureConverter();
if (!NavCategory.IsConverterViewMode(previousMode))
{
m_converter.AnimateConverter();
}
}
break;
} }
else if (NavCategory.IsConverterViewMode(newValue))
{
if (Model.CalculatorViewModel != null)
{
Model.CalculatorViewModel.HistoryVM.AreHistoryShortcutsEnabled = false;
}
EnsureConverter();
if (!NavCategory.IsConverterViewMode(previousMode))
{
m_converter.AnimateConverter();
}
}
break;
} }
ShowHideControls(newValue); ShowHideControls(newValue);