From f252e13c28686687079ff471632be223660b9c3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=97=AD?= Date: Fri, 12 May 2023 16:52:42 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20ContentDialog=20?= =?UTF-8?q?=E7=9A=84=E5=AD=97=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Magpie.App/ContentDialogHelper.cpp | 4 ---- src/Magpie.App/ShortcutControl.cpp | 2 ++ 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/Magpie.App/ContentDialogHelper.cpp b/src/Magpie.App/ContentDialogHelper.cpp index 826a2863f..cee58c5a3 100644 --- a/src/Magpie.App/ContentDialogHelper.cpp +++ b/src/Magpie.App/ContentDialogHelper.cpp @@ -12,10 +12,6 @@ static weak_ref activeDialog; IAsyncOperation ContentDialogHelper::ShowAsync(ContentDialog dialog) { assert(activeDialog == nullptr); - // 设置 Language 属性帮助 XAML 选择合适的字体 - MainPage mainPage = Application::Current().as().MainPage(); - dialog.Content().as().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 index aad49aef6..12690a20f 100644 --- 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();