diff --git a/src/Snap.Hutao/Snap.Hutao/Core/Windowing/WindowController.cs b/src/Snap.Hutao/Snap.Hutao/Core/Windowing/WindowController.cs index 17ab0ce3..5b4bada8 100644 --- a/src/Snap.Hutao/Snap.Hutao/Core/Windowing/WindowController.cs +++ b/src/Snap.Hutao/Snap.Hutao/Core/Windowing/WindowController.cs @@ -69,9 +69,12 @@ internal sealed class WindowController window.Activate(); options.BringToForeground(); - AppOptions appOptions = serviceProvider.GetRequiredService(); - UpdateSystemBackdrop(appOptions.BackdropType); - appOptions.PropertyChanged += OnOptionsPropertyChanged; + if (options.UseSystemBackdrop) + { + AppOptions appOptions = serviceProvider.GetRequiredService(); + UpdateSystemBackdrop(appOptions.BackdropType); + appOptions.PropertyChanged += OnOptionsPropertyChanged; + } subclass.Initialize(); diff --git a/src/Snap.Hutao/Snap.Hutao/Core/Windowing/WindowOptions.cs b/src/Snap.Hutao/Snap.Hutao/Core/Windowing/WindowOptions.cs index d65b4aa2..d2a4e805 100644 --- a/src/Snap.Hutao/Snap.Hutao/Core/Windowing/WindowOptions.cs +++ b/src/Snap.Hutao/Snap.Hutao/Core/Windowing/WindowOptions.cs @@ -41,25 +41,21 @@ internal readonly struct WindowOptions /// public readonly bool PersistSize; + public readonly bool UseSystemBackdrop; + /// /// 是否使用 Win UI 3 自带的拓展标题栏实现 /// public readonly bool UseLegacyDragBarImplementation = !AppWindowTitleBar.IsCustomizationSupported(); - /// - /// 构造一个新的窗体选项 - /// - /// 窗体 - /// 标题栏 - /// 初始尺寸 - /// 持久化尺寸 - public WindowOptions(Window window, FrameworkElement titleBar, SizeInt32 initSize, bool persistSize = false) + public WindowOptions(Window window, FrameworkElement titleBar, SizeInt32 initSize, bool persistSize = false, bool useSystemBackdrop = true) { Hwnd = WindowNative.GetWindowHandle(window); InputNonClientPointerSource = InputNonClientPointerSource.GetForWindowId(window.AppWindow.Id); TitleBar = titleBar; InitSize = initSize; PersistSize = persistSize; + UseSystemBackdrop = useSystemBackdrop; } /// diff --git a/src/Snap.Hutao/Snap.Hutao/MainWindow.xaml.cs b/src/Snap.Hutao/Snap.Hutao/MainWindow.xaml.cs index 463bc5f4..61b48cc9 100644 --- a/src/Snap.Hutao/Snap.Hutao/MainWindow.xaml.cs +++ b/src/Snap.Hutao/Snap.Hutao/MainWindow.xaml.cs @@ -27,7 +27,7 @@ internal sealed partial class MainWindow : Window, IWindowOptionsSource, IMinMax public MainWindow(IServiceProvider serviceProvider) { InitializeComponent(); - windowOptions = new(this, TitleBarView.DragArea, new(1200, 741), true); + windowOptions = new(this, TitleBarView.DragArea, new(1200, 741), true, false); this.InitializeController(serviceProvider); } diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/TestBackground.jpg b/src/Snap.Hutao/Snap.Hutao/Resource/TestBackground.jpg deleted file mode 100644 index e1fa9164..00000000 Binary files a/src/Snap.Hutao/Snap.Hutao/Resource/TestBackground.jpg and /dev/null differ diff --git a/src/Snap.Hutao/Snap.Hutao/Service/Game/Launching/Handler/LaunchExecutionEnsureGameResourceHandler.cs b/src/Snap.Hutao/Snap.Hutao/Service/Game/Launching/Handler/LaunchExecutionEnsureGameResourceHandler.cs index 6430b162..28c746a1 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/Game/Launching/Handler/LaunchExecutionEnsureGameResourceHandler.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/Game/Launching/Handler/LaunchExecutionEnsureGameResourceHandler.cs @@ -130,13 +130,6 @@ internal sealed class LaunchExecutionEnsureGameResourceHandler : ILaunchExecutio return true; } - // Program Files has special permissions limitation. - string programFiles = Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles); - if (folder.StartsWith(programFiles, StringComparison.OrdinalIgnoreCase)) - { - return false; - } - try { string tempFilePath = Path.Combine(folder, $"{Guid.NewGuid():N}.tmp"); diff --git a/src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj b/src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj index fc52d0c1..abf90150 100644 --- a/src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj +++ b/src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj @@ -137,7 +137,6 @@ - @@ -281,7 +280,6 @@ -