fix: 修复 ContentDialog 的字体

Blinue · May 12, 2023 · f252e13 · f252e13
1 parent a27ca84
commit f252e13
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/src/Magpie.App/ContentDialogHelper.cpp b/src/Magpie.App/ContentDialogHelper.cpp
@@ -12,10 +12,6 @@ static weak_ref<ContentDialog> activeDialog;
 IAsyncOperation<ContentDialogResult> ContentDialogHelper::ShowAsync(ContentDialog dialog) {
 	assert(activeDialog == nullptr);
 
-	// 设置 Language 属性帮助 XAML 选择合适的字体
-	MainPage mainPage = Application::Current().as<App>().MainPage();
-	dialog.Content().as<FrameworkElement>().Language(mainPage.Language());
-
 	activeDialog = dialog;
 	ContentDialogResult result = co_await dialog.ShowAsync();
 	activeDialog = nullptr;

diff --git a/src/Magpie.App/ShortcutControl.cpp b/src/Magpie.App/ShortcutControl.cpp
@@ -75,6 +75,8 @@ fire_and_forget ShortcutControl::EditButton_Click(IInspectable const&, RoutedEve
 		_shortcutDialog = ContentDialog();
 		_ShortcutDialogContent = ShortcutDialog();
 
+		// 设置 Language 属性帮助 XAML 选择合适的字体
+		_shortcutDialog.Language(Language());
 		_shortcutDialog.Title(GetValue(TitleProperty));
 		_shortcutDialog.Content(_ShortcutDialogContent);
 		ResourceLoader resourceLoader = ResourceLoader::GetForCurrentView();