From 9c4d4cda1e77c1b995550882dde445f695afb9ad Mon Sep 17 00:00:00 2001 From: DismissedLight <1686188646@qq.com> Date: Mon, 13 Feb 2023 13:51:15 +0800 Subject: [PATCH] fix localization --- .../Core/Annotation/LocalizationKeyAttribute.cs | 2 +- .../Snap.Hutao/Resource/Localization/SH.Designer.cs | 2 +- src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx | 2 +- .../Snap.Hutao/ViewModel/LaunchGameViewModel.cs | 8 ++++++-- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/Snap.Hutao/Snap.Hutao/Core/Annotation/LocalizationKeyAttribute.cs b/src/Snap.Hutao/Snap.Hutao/Core/Annotation/LocalizationKeyAttribute.cs index 4f68fa60..bcda0ccf 100644 --- a/src/Snap.Hutao/Snap.Hutao/Core/Annotation/LocalizationKeyAttribute.cs +++ b/src/Snap.Hutao/Snap.Hutao/Core/Annotation/LocalizationKeyAttribute.cs @@ -6,7 +6,7 @@ namespace Snap.Hutao.Core.Annotation; /// /// 本地化键 /// -[AttributeUsage(AttributeTargets.Enum)] +[AttributeUsage(AttributeTargets.Field)] internal class LocalizationKeyAttribute : Attribute { /// diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs index 38b80cfd..ec143245 100644 --- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs +++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs @@ -1843,7 +1843,7 @@ namespace Snap.Hutao.Resource.Localization { } /// - /// 查找类似 选择任何服务器 的本地化字符串。 + /// 查找类似 尚未选择任何服务器 的本地化字符串。 /// internal static string ViewModelLaunchGameSchemeNotSelected { get { diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx index 7be63528..f5db1be7 100644 --- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx +++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx @@ -712,7 +712,7 @@ 游戏路径不正确,前往设置更改游戏路径 - 选择任何服务器 + 尚未选择任何服务器 切换账号失败 diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/LaunchGameViewModel.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/LaunchGameViewModel.cs index 95a7bdcc..c50790c6 100644 --- a/src/Snap.Hutao/Snap.Hutao/ViewModel/LaunchGameViewModel.cs +++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/LaunchGameViewModel.cs @@ -5,6 +5,7 @@ using CommunityToolkit.Mvvm.Input; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Caching.Memory; using Microsoft.Extensions.DependencyInjection; +using Microsoft.UI.Windowing; using Snap.Hutao.Control.Extension; using Snap.Hutao.Core.Database; using Snap.Hutao.Core.ExceptionService; @@ -20,6 +21,7 @@ using Snap.Hutao.View.Dialog; using Snap.Hutao.Web.Hoyolab.Takumi.Binding; using System.Collections.ObjectModel; using System.IO; +using Windows.Graphics; namespace Snap.Hutao.ViewModel; @@ -256,10 +258,12 @@ internal class LaunchGameViewModel : Abstraction.ViewModel isBorderless = settings.SingleOrAdd(SettingEntry.LaunchIsBorderless, FalseString).GetBoolean(); OnPropertyChanged(nameof(IsBorderless)); - screenWidth = settings.SingleOrAdd(SettingEntry.LaunchScreenWidth, "1920").GetInt32(); + RectInt32 primaryRect = DisplayArea.Primary.OuterBounds; + + screenWidth = settings.SingleOrAdd(SettingEntry.LaunchScreenWidth, $"{primaryRect.Width}").GetInt32(); OnPropertyChanged(nameof(ScreenWidth)); - screenHeight = settings.SingleOrAdd(SettingEntry.LaunchScreenHeight, "1080").GetInt32(); + screenHeight = settings.SingleOrAdd(SettingEntry.LaunchScreenHeight, $"{primaryRect.Height}").GetInt32(); OnPropertyChanged(nameof(ScreenHeight)); unlockFps = settings.SingleOrAdd(SettingEntry.LaunchUnlockFps, FalseString).GetBoolean();