Fun/Snap.Hutao
1
0
Fork 0
mirror of https://jihulab.com/DGP-Studio/Snap.Hutao.git synced 2025-11-19 21:02:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1380 from DGP-Studio/fix/1379

Browse Source 
fix #1379
This commit is contained in:
DismissedLight
2024-02-09 14:16:39 +08:00
committed by GitHub
parent 8b1613d46f 3ef117e683
commit bc3df782e4
5 changed files with 34 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx
View File

@@ -1391,6 +1391,9 @@
<data name="ViewLaunchGameHeader" xml:space="preserve">
<value>启动游戏</value>
</data>
<data name="ViewListViewDragElevatedHint" xml:space="preserve">
<value>管理员模式下无法拖动排序</value>
</data>
<data name="ViewModelAchievementArchiveAdded" xml:space="preserve">
<value>存档 [{0}] 添加成功</value>
</data>

1
src/Snap.Hutao/Snap.Hutao/Service/User/IUserDbService.cs
View File

@@ -14,5 +14,6 @@ internal interface IUserDbService
ValueTask<List<Model.Entity.User>> GetUserListAsync();
ValueTask UpdateUserAsync(Model.Entity.User user);
ValueTask ClearUserSelectionAsync();
}

19
src/Snap.Hutao/Snap.Hutao/View/Page/LaunchGamePage.xaml
View File

@@ -200,13 +200,24 @@
Header="{shcm:ResourceString Name=ViewPageLaunchGameSwitchAccountHeader}"
HeaderIcon="{shcm:FontIcon Glyph=&#xE748;}"
IsClickEnabled="True"/>
<Border Padding="0,1" Style="{StaticResource BorderCardStyle}">
<Border Style="{StaticResource BorderCardStyle}">
<ListView
AllowDrop="True"
CanReorderItems="True"
Padding="{StaticResource ListViewInSplitPanePadding}"
AllowDrop="{Binding RuntimeOptions.IsElevated, Converter={StaticResource BoolNegationConverter}}"
CanReorderItems="{Binding RuntimeOptions.IsElevated, Converter={StaticResource BoolNegationConverter}}"
ItemTemplate="{StaticResource GameAccountListTemplate}"
ItemsSource="{Binding GameAccountsView}"
SelectedItem="{Binding SelectedGameAccount, Mode=TwoWay}"/>
SelectedItem="{Binding SelectedGameAccount, Mode=TwoWay}">
<ListView.Header>
<InfoBar
Title="{shcm:ResourceString Name=ViewListViewDragElevatedHint}"
Margin="4,2,4,2"
IsClosable="True"
IsOpen="True"
Severity="Warning"
Visibility="{Binding RuntimeOptions.IsElevated, Converter={StaticResource BoolToVisibilityConverter}}"/>
</ListView.Header>
</ListView>
</Border>
<cwc:SettingsCard
Description="{shcm:ResourceString Name=ViewPageLaunchGameWindowsHDRDescription}"

17
src/Snap.Hutao/Snap.Hutao/View/UserView.xaml
View File

@@ -261,11 +261,20 @@
<ListView
Grid.Row="1"
Margin="4"
AllowDrop="True"
CanReorderItems="True"
AllowDrop="{Binding RuntimeOptions.IsElevated, Converter={StaticResource BoolNegationConverter}}"
CanReorderItems="{Binding RuntimeOptions.IsElevated, Converter={StaticResource BoolNegationConverter}}"
ItemsSource="{Binding Users}"
SelectedItem="{Binding SelectedUser, Mode=TwoWay}"
SelectionMode="Single">
<ListView.Header>
<InfoBar
Title="{shcm:ResourceString Name=ViewListViewDragElevatedHint}"
Margin="4,0,4,2"
IsClosable="True"
IsOpen="True"
Severity="Warning"
Visibility="{Binding RuntimeOptions.IsElevated, Converter={StaticResource BoolToVisibilityConverter}}"/>
</ListView.Header>
<ListView.ItemTemplate>
<DataTemplate>
<Grid Padding="0,12" Background="Transparent">
@@ -277,12 +286,12 @@
</Grid.ColumnDefinitions>
<PersonPicture
Height="32"
Margin="0,0"
Margin="2,0"
HorizontalAlignment="Left"
ProfilePicture="{Binding UserInfo.AvatarUrl, Mode=OneWay}"/>
<TextBlock
Grid.Column="1"
Margin="12,0,0,0"
Margin="10,0,0,0"
VerticalAlignment="Center"
Text="{Binding UserInfo.Nickname}"/>
<TextBlock

2
src/Snap.Hutao/Snap.Hutao/ViewModel/User/UserViewModel.cs
View File

@@ -43,6 +43,8 @@ internal sealed partial class UserViewModel : ObservableObject
private User? selectedUser;
private ObservableReorderableDbCollection<User, EntityUser>? users;
public RuntimeOptions RuntimeOptions { get => runtimeOptions; }
/// <summary>
/// 当前选择的用户信息
/// </summary>