From 3ef117e683194fdf1e96446e6c27e3a96718d5c6 Mon Sep 17 00:00:00 2001
From: qhy040404 <qhy040404@163.com>
Date: Fri, 9 Feb 2024 12:22:52 +0800
Subject: [PATCH] fix #1379

---
 .../Snap.Hutao/Resource/Localization/SH.resx  |  3 +++
 .../Snap.Hutao/Service/User/IUserDbService.cs |  1 +
 .../Snap.Hutao/View/Page/LaunchGamePage.xaml  | 19 +++++++++++++++----
 src/Snap.Hutao/Snap.Hutao/View/UserView.xaml  | 17 +++++++++++++----
 .../ViewModel/User/UserViewModel.cs           |  2 ++
 5 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx
index 3497c346..1a90fc7f 100644
--- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx
+++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx
@@ -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>
diff --git a/src/Snap.Hutao/Snap.Hutao/Service/User/IUserDbService.cs b/src/Snap.Hutao/Snap.Hutao/Service/User/IUserDbService.cs
index 68124f71..ea332461 100644
--- a/src/Snap.Hutao/Snap.Hutao/Service/User/IUserDbService.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Service/User/IUserDbService.cs
@@ -14,5 +14,6 @@ internal interface IUserDbService
     ValueTask<List<Model.Entity.User>> GetUserListAsync();
 
     ValueTask UpdateUserAsync(Model.Entity.User user);
+
     ValueTask ClearUserSelectionAsync();
 }
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/LaunchGamePage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/LaunchGamePage.xaml
index 5561b78e..1d5c95d1 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/LaunchGamePage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/LaunchGamePage.xaml
@@ -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}"
diff --git a/src/Snap.Hutao/Snap.Hutao/View/UserView.xaml b/src/Snap.Hutao/Snap.Hutao/View/UserView.xaml
index 19c24e07..97039f8b 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/UserView.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/UserView.xaml
@@ -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
diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/User/UserViewModel.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/User/UserViewModel.cs
index cee9931e..8459a6ed 100644
--- a/src/Snap.Hutao/Snap.Hutao/ViewModel/User/UserViewModel.cs
+++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/User/UserViewModel.cs
@@ -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>