From 3a48c8857b7a8d00041ff12c6e700a8cf2a8e769 Mon Sep 17 00:00:00 2001 From: Tian Date: Tue, 8 Jul 2025 20:16:57 +0800 Subject: [PATCH] fix aot mode --- .../ApplicationViewModel.cs | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/Calculator.ManagedViewModels/ApplicationViewModel.cs b/src/Calculator.ManagedViewModels/ApplicationViewModel.cs index 32cdedca..95182ee9 100644 --- a/src/Calculator.ManagedViewModels/ApplicationViewModel.cs +++ b/src/Calculator.ManagedViewModels/ApplicationViewModel.cs @@ -206,12 +206,14 @@ namespace CalculatorApp.ManagedViewModels var DefaultSize = new Size(320, 394); const string LaunchedSettingsKey = "calculatorAlwaysOnTopLaunched"; var settings = ApplicationData.Current.LocalSettings; - bool success; if (ApplicationView.GetForCurrentView().ViewMode == ApplicationViewMode.CompactOverlay) { settings.Values[WidthLocalSettingsKey] = width; settings.Values[HeightLocalSettingsKey] = height; - success = await ApplicationView.GetForCurrentView().TryEnterViewModeAsync(ApplicationViewMode.Default); + bool success = await ApplicationView.GetForCurrentView().TryEnterViewModeAsync(ApplicationViewMode.Default); + _calcVm.HistoryVM.AreHistoryShortcutsEnabled = success; + _calcVm.IsAlwaysOnTop = !success; + IsAlwaysOnTop = !success; } else { @@ -233,11 +235,11 @@ namespace CalculatorApp.ManagedViewModels compactOptions.CustomSize = DefaultSize; } } - success = await ApplicationView.GetForCurrentView().TryEnterViewModeAsync(ApplicationViewMode.CompactOverlay, compactOptions); + bool success = await ApplicationView.GetForCurrentView().TryEnterViewModeAsync(ApplicationViewMode.CompactOverlay, compactOptions); + _calcVm.HistoryVM.AreHistoryShortcutsEnabled = !success; + _calcVm.IsAlwaysOnTop = success; + IsAlwaysOnTop = success; } - _calcVm.HistoryVM.AreHistoryShortcutsEnabled = success; - _calcVm.IsAlwaysOnTop = !success; - IsAlwaysOnTop = !success; SetDisplayNormalAlwaysOnTopOption(); }