From 026c68229af85f7aee5cdd662509baf801c831b4 Mon Sep 17 00:00:00 2001 From: DismissedLight <1686188646@qq.com> Date: Thu, 19 Oct 2023 20:46:29 +0800 Subject: [PATCH] fix #925 --- src/Snap.Hutao/Snap.Hutao/Factory/ContentDialogFactory.cs | 8 ++++++-- .../View/Dialog/AchievementArchiveCreateDialog.xaml.cs | 1 - .../View/Dialog/AchievementImportDialog.xaml.cs | 1 - .../Snap.Hutao/View/Dialog/CultivateProjectDialog.xaml.cs | 1 - .../Dialog/CultivatePromotionDeltaBatchDialog.xaml.cs | 1 - .../View/Dialog/CultivatePromotionDeltaDialog.xaml.cs | 1 - .../View/Dialog/DailyNoteNotificationDialog.xaml.cs | 1 - .../Snap.Hutao/View/Dialog/GachaLogImportDialog.xaml.cs | 1 - .../View/Dialog/GachaLogRefreshProgressDialog.xaml.cs | 1 - .../Snap.Hutao/View/Dialog/GachaLogUrlDialog.xaml.cs | 1 - .../Snap.Hutao/View/Dialog/GeetestCustomUrlDialog.xaml.cs | 2 +- .../View/Dialog/LaunchGameAccountNameDialog.xaml.cs | 1 - .../View/Dialog/LaunchGamePackageConvertDialog.xaml.cs | 1 - src/Snap.Hutao/Snap.Hutao/View/Dialog/UserDialog.xaml.cs | 1 - 14 files changed, 7 insertions(+), 15 deletions(-) diff --git a/src/Snap.Hutao/Snap.Hutao/Factory/ContentDialogFactory.cs b/src/Snap.Hutao/Snap.Hutao/Factory/ContentDialogFactory.cs index ccb40ed0..ad934866 100644 --- a/src/Snap.Hutao/Snap.Hutao/Factory/ContentDialogFactory.cs +++ b/src/Snap.Hutao/Snap.Hutao/Factory/ContentDialogFactory.cs @@ -68,12 +68,16 @@ internal sealed partial class ContentDialogFactory : IContentDialogFactory where TContentDialog : ContentDialog { await taskContext.SwitchToMainThreadAsync(); - return serviceProvider.CreateInstance(parameters); + TContentDialog contentDialog = serviceProvider.CreateInstance(parameters); + contentDialog.XamlRoot = currentWindowReference.Window.Content.XamlRoot; + return contentDialog; } public TContentDialog CreateInstance(params object[] parameters) where TContentDialog : ContentDialog { - return serviceProvider.CreateInstance(parameters); + TContentDialog contentDialog = serviceProvider.CreateInstance(parameters); + contentDialog.XamlRoot = currentWindowReference.Window.Content.XamlRoot; + return contentDialog; } } \ No newline at end of file diff --git a/src/Snap.Hutao/Snap.Hutao/View/Dialog/AchievementArchiveCreateDialog.xaml.cs b/src/Snap.Hutao/Snap.Hutao/View/Dialog/AchievementArchiveCreateDialog.xaml.cs index 5aa7f0af..1dcb9a20 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/Dialog/AchievementArchiveCreateDialog.xaml.cs +++ b/src/Snap.Hutao/Snap.Hutao/View/Dialog/AchievementArchiveCreateDialog.xaml.cs @@ -21,7 +21,6 @@ internal sealed partial class AchievementArchiveCreateDialog : ContentDialog public AchievementArchiveCreateDialog(IServiceProvider serviceProvider) { InitializeComponent(); - XamlRoot = serviceProvider.GetRequiredService().Content.XamlRoot; taskContext = serviceProvider.GetRequiredService(); } diff --git a/src/Snap.Hutao/Snap.Hutao/View/Dialog/AchievementImportDialog.xaml.cs b/src/Snap.Hutao/Snap.Hutao/View/Dialog/AchievementImportDialog.xaml.cs index a4e76bbc..8ed6953f 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/Dialog/AchievementImportDialog.xaml.cs +++ b/src/Snap.Hutao/Snap.Hutao/View/Dialog/AchievementImportDialog.xaml.cs @@ -25,7 +25,6 @@ internal sealed partial class AchievementImportDialog : ContentDialog public AchievementImportDialog(IServiceProvider serviceProvider, UIAF uiaf) { InitializeComponent(); - XamlRoot = serviceProvider.GetRequiredService().Content.XamlRoot; taskContext = serviceProvider.GetRequiredService(); UIAF = uiaf; diff --git a/src/Snap.Hutao/Snap.Hutao/View/Dialog/CultivateProjectDialog.xaml.cs b/src/Snap.Hutao/Snap.Hutao/View/Dialog/CultivateProjectDialog.xaml.cs index a6f7e01b..4372dcbe 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/Dialog/CultivateProjectDialog.xaml.cs +++ b/src/Snap.Hutao/Snap.Hutao/View/Dialog/CultivateProjectDialog.xaml.cs @@ -24,7 +24,6 @@ internal sealed partial class CultivateProjectDialog : ContentDialog public CultivateProjectDialog(IServiceProvider serviceProvider) { InitializeComponent(); - XamlRoot = serviceProvider.GetRequiredService().Content.XamlRoot; taskContext = serviceProvider.GetRequiredService(); } diff --git a/src/Snap.Hutao/Snap.Hutao/View/Dialog/CultivatePromotionDeltaBatchDialog.xaml.cs b/src/Snap.Hutao/Snap.Hutao/View/Dialog/CultivatePromotionDeltaBatchDialog.xaml.cs index e483bbf0..eeeb6742 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/Dialog/CultivatePromotionDeltaBatchDialog.xaml.cs +++ b/src/Snap.Hutao/Snap.Hutao/View/Dialog/CultivatePromotionDeltaBatchDialog.xaml.cs @@ -14,7 +14,6 @@ internal sealed partial class CultivatePromotionDeltaBatchDialog : ContentDialog public CultivatePromotionDeltaBatchDialog(IServiceProvider serviceProvider) { InitializeComponent(); - XamlRoot = serviceProvider.GetRequiredService().Content.XamlRoot; taskContext = serviceProvider.GetRequiredService(); diff --git a/src/Snap.Hutao/Snap.Hutao/View/Dialog/CultivatePromotionDeltaDialog.xaml.cs b/src/Snap.Hutao/Snap.Hutao/View/Dialog/CultivatePromotionDeltaDialog.xaml.cs index d49089f8..c4a7dcbb 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/Dialog/CultivatePromotionDeltaDialog.xaml.cs +++ b/src/Snap.Hutao/Snap.Hutao/View/Dialog/CultivatePromotionDeltaDialog.xaml.cs @@ -27,7 +27,6 @@ internal sealed partial class CultivatePromotionDeltaDialog : ContentDialog public CultivatePromotionDeltaDialog(IServiceProvider serviceProvider, CalculableOptions options) { InitializeComponent(); - XamlRoot = serviceProvider.GetRequiredService().Content.XamlRoot; taskContext = serviceProvider.GetRequiredService(); diff --git a/src/Snap.Hutao/Snap.Hutao/View/Dialog/DailyNoteNotificationDialog.xaml.cs b/src/Snap.Hutao/Snap.Hutao/View/Dialog/DailyNoteNotificationDialog.xaml.cs index d3526144..b61b0881 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/Dialog/DailyNoteNotificationDialog.xaml.cs +++ b/src/Snap.Hutao/Snap.Hutao/View/Dialog/DailyNoteNotificationDialog.xaml.cs @@ -20,7 +20,6 @@ internal sealed partial class DailyNoteNotificationDialog : ContentDialog public DailyNoteNotificationDialog(IServiceProvider serviceProvider, DailyNoteEntry entry) { InitializeComponent(); - XamlRoot = serviceProvider.GetRequiredService().Content.XamlRoot; DataContext = entry; } diff --git a/src/Snap.Hutao/Snap.Hutao/View/Dialog/GachaLogImportDialog.xaml.cs b/src/Snap.Hutao/Snap.Hutao/View/Dialog/GachaLogImportDialog.xaml.cs index 25134cdb..06da99be 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/Dialog/GachaLogImportDialog.xaml.cs +++ b/src/Snap.Hutao/Snap.Hutao/View/Dialog/GachaLogImportDialog.xaml.cs @@ -24,7 +24,6 @@ internal sealed partial class GachaLogImportDialog : ContentDialog public GachaLogImportDialog(IServiceProvider serviceProvider, UIGF uigf) { InitializeComponent(); - XamlRoot = serviceProvider.GetRequiredService().Content.XamlRoot; taskContext = serviceProvider.GetRequiredService(); UIGF = uigf; diff --git a/src/Snap.Hutao/Snap.Hutao/View/Dialog/GachaLogRefreshProgressDialog.xaml.cs b/src/Snap.Hutao/Snap.Hutao/View/Dialog/GachaLogRefreshProgressDialog.xaml.cs index c67cf741..3cb097e7 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/Dialog/GachaLogRefreshProgressDialog.xaml.cs +++ b/src/Snap.Hutao/Snap.Hutao/View/Dialog/GachaLogRefreshProgressDialog.xaml.cs @@ -21,7 +21,6 @@ internal sealed partial class GachaLogRefreshProgressDialog : ContentDialog public GachaLogRefreshProgressDialog(IServiceProvider serviceProvider) { InitializeComponent(); - XamlRoot = serviceProvider.GetRequiredService().Content.XamlRoot; } /// diff --git a/src/Snap.Hutao/Snap.Hutao/View/Dialog/GachaLogUrlDialog.xaml.cs b/src/Snap.Hutao/Snap.Hutao/View/Dialog/GachaLogUrlDialog.xaml.cs index d1bdad21..480cd525 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/Dialog/GachaLogUrlDialog.xaml.cs +++ b/src/Snap.Hutao/Snap.Hutao/View/Dialog/GachaLogUrlDialog.xaml.cs @@ -20,7 +20,6 @@ internal sealed partial class GachaLogUrlDialog : ContentDialog public GachaLogUrlDialog(IServiceProvider serviceProvider) { InitializeComponent(); - XamlRoot = serviceProvider.GetRequiredService().Content.XamlRoot; taskContext = serviceProvider.GetRequiredService(); } diff --git a/src/Snap.Hutao/Snap.Hutao/View/Dialog/GeetestCustomUrlDialog.xaml.cs b/src/Snap.Hutao/Snap.Hutao/View/Dialog/GeetestCustomUrlDialog.xaml.cs index d6902ef1..83bf5ae4 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/Dialog/GeetestCustomUrlDialog.xaml.cs +++ b/src/Snap.Hutao/Snap.Hutao/View/Dialog/GeetestCustomUrlDialog.xaml.cs @@ -14,7 +14,7 @@ internal sealed partial class GeetestCustomUrlDialog : ContentDialog public GeetestCustomUrlDialog(IServiceProvider serviceProvider) { InitializeComponent(); - XamlRoot = serviceProvider.GetRequiredService().Content.XamlRoot; + Text = serviceProvider.GetRequiredService().GeetestCustomCompositeUrl; taskContext = serviceProvider.GetRequiredService(); } diff --git a/src/Snap.Hutao/Snap.Hutao/View/Dialog/LaunchGameAccountNameDialog.xaml.cs b/src/Snap.Hutao/Snap.Hutao/View/Dialog/LaunchGameAccountNameDialog.xaml.cs index 6863d65f..209a7cfb 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/Dialog/LaunchGameAccountNameDialog.xaml.cs +++ b/src/Snap.Hutao/Snap.Hutao/View/Dialog/LaunchGameAccountNameDialog.xaml.cs @@ -21,7 +21,6 @@ internal sealed partial class LaunchGameAccountNameDialog : ContentDialog public LaunchGameAccountNameDialog(IServiceProvider serviceProvider) { InitializeComponent(); - XamlRoot = serviceProvider.GetRequiredService().Content.XamlRoot; taskContext = serviceProvider.GetRequiredService(); } diff --git a/src/Snap.Hutao/Snap.Hutao/View/Dialog/LaunchGamePackageConvertDialog.xaml.cs b/src/Snap.Hutao/Snap.Hutao/View/Dialog/LaunchGamePackageConvertDialog.xaml.cs index 9fed4ba4..62b3d631 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/Dialog/LaunchGamePackageConvertDialog.xaml.cs +++ b/src/Snap.Hutao/Snap.Hutao/View/Dialog/LaunchGamePackageConvertDialog.xaml.cs @@ -21,7 +21,6 @@ internal sealed partial class LaunchGamePackageConvertDialog : ContentDialog public LaunchGamePackageConvertDialog(IServiceProvider serviceProvider) { InitializeComponent(); - XamlRoot = serviceProvider.GetRequiredService().Content.XamlRoot; DataContext = this; } diff --git a/src/Snap.Hutao/Snap.Hutao/View/Dialog/UserDialog.xaml.cs b/src/Snap.Hutao/Snap.Hutao/View/Dialog/UserDialog.xaml.cs index 45fe84bf..c4f82742 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/Dialog/UserDialog.xaml.cs +++ b/src/Snap.Hutao/Snap.Hutao/View/Dialog/UserDialog.xaml.cs @@ -22,7 +22,6 @@ internal sealed partial class UserDialog : ContentDialog public UserDialog(IServiceProvider serviceProvider) { InitializeComponent(); - XamlRoot = serviceProvider.GetRequiredService().Content.XamlRoot; taskContext = serviceProvider.GetRequiredService(); }