fix: #807

VShawn · VShawn · commit 8ca54adb670a · 2024-12-12T15:31:03.000+08:00
diff --git a/Ui/View/Host/ProtocolHosts/FileTransmitHost.xaml b/Ui/View/Host/ProtocolHosts/FileTransmitHost.xaml
@@ -107,7 +107,6 @@
                           ItemsSource="{Binding RemoteItems}" 
                           SelectedItem="{Binding SelectedRemoteItem}"
                           SelectionChanged="TvFileList_OnSelectionChanged"
-                          PreviewMouseDown="TvFileList_OnPreviewMouseDown"
                           PreviewKeyDown="TvFileList_OnKeyDown"
                           MouseDoubleClick="TvFileList_OnMouseDoubleClick"
                           PreviewMouseRightButtonDown="FileList_OnPreviewMouseRightButtonDown"
@@ -638,9 +637,9 @@
 
 
 
-        <Grid Name="GridLoading" Visibility="{Binding GridLoadingVisibility}">
+        <!--<Grid Name="GridLoading" Visibility="{Binding GridLoadingVisibility}">
             <Grid Background="Black" Opacity="{Binding GridLoadingBgOpacity}"></Grid>
             <Control Style="{StaticResource BusyAnimationStyle}" Background="Transparent"/>
-        </Grid>
+        </Grid>-->
     </Grid>
 </protocolHosts1:HostBase>
diff --git a/Ui/View/Host/ProtocolHosts/FileTransmitHost.xaml.cs b/Ui/View/Host/ProtocolHosts/FileTransmitHost.xaml.cs
@@ -54,9 +54,10 @@ private FileTransmitHost(ProtocolBase protocolServer) : base(protocolServer, fal
 
             _vmRemote.PropertyChanged += (sender, args) =>
             {
-                if (args.PropertyName == nameof(VmFileTransmitHost.SelectedRemoteItem))
+                if (args.PropertyName == nameof(VmFileTransmitHost.SelectedRemoteItem)
+                    && _vmRemote.SelectedRemoteItem != null)
                 {
-                    TvFileList.ScrollIntoView(TvFileList.SelectedItem);
+                    TvFileList.ScrollIntoView(_vmRemote.SelectedRemoteItem);
                 }
             };
 
@@ -168,11 +169,6 @@ private void FileList_OnPreviewMouseRightButtonDown(object sender, MouseButtonEv
             _vmRemote.FileList_OnPreviewMouseRightButtonDown(sender, e);
         }
 
-        private void TvFileList_OnPreviewMouseDown(object sender, MouseButtonEventArgs e)
-        {
-            _vmRemote.TvFileList_OnPreviewMouseDown(sender, e);
-        }
-
         private void TvFileList_OnSelectionChanged(object sender, SelectionChangedEventArgs e)
         {
             _vmRemote.CmdEndRenaming.Execute();
diff --git a/Ui/View/Host/ProtocolHosts/VmFileTransmitHost.cs b/Ui/View/Host/ProtocolHosts/VmFileTransmitHost.cs
@@ -278,26 +278,6 @@ private void ShowFolder(string path, int mode = 0, bool showIoMessage = true)
             t.Start();
         }
 
-        public void TvFileList_OnPreviewMouseDown(object sender, MouseButtonEventArgs e)
-        {
-            ListView? view = null;
-            ScrollContentPresenter? p = null;
-            if (sender is ListView lv)
-            {
-                view = lv;
-                var ip = MyVisualTreeHelper.FindVisualChild<ItemsPresenter>(view);
-                p = MyVisualTreeHelper.FindVisualChild<ScrollContentPresenter>((DependencyObject)ip!);
-            }
-            if (view == null || p == null)
-                return;
-            var curSelectedItem = MyVisualTreeHelper.GetItemOnPosition(p, e.GetPosition(p));
-            if (curSelectedItem == null)
-            {
-                ((ListView)sender).SelectedItem = null;
-            }
-            e.Handled = false;
-        }
-
         public void FileList_OnPreviewMouseRightButtonDown(object sender, MouseButtonEventArgs e)
         {
             ListView? view = null;

Original file line number	Diff line number	Diff line change
`@@ -54,9 +54,10 @@ private FileTransmitHost(ProtocolBase protocolServer) : base(protocolServer, fal`
`54`	`54`
`55`	`55`	`_vmRemote.PropertyChanged += (sender, args) =>`
`56`	`56`	`{`
`57`		`- if (args.PropertyName == nameof(VmFileTransmitHost.SelectedRemoteItem))`
	`57`	`+ if (args.PropertyName == nameof(VmFileTransmitHost.SelectedRemoteItem)`
	`58`	`+ && _vmRemote.SelectedRemoteItem != null)`
`58`	`59`	`{`
`59`		`- TvFileList.ScrollIntoView(TvFileList.SelectedItem);`
	`60`	`+ TvFileList.ScrollIntoView(_vmRemote.SelectedRemoteItem);`
`60`	`61`	`}`
`61`	`62`	`};`
`62`	`63`
`@@ -168,11 +169,6 @@ private void FileList_OnPreviewMouseRightButtonDown(object sender, MouseButtonEv`
`168`	`169`	`_vmRemote.FileList_OnPreviewMouseRightButtonDown(sender, e);`
`169`	`170`	`}`
`170`	`171`
`171`		`- private void TvFileList_OnPreviewMouseDown(object sender, MouseButtonEventArgs e)`
`172`		`- {`
`173`		`- _vmRemote.TvFileList_OnPreviewMouseDown(sender, e);`
`174`		`- }`
`175`		`-`
`176`	`172`	`private void TvFileList_OnSelectionChanged(object sender, SelectionChangedEventArgs e)`
`177`	`173`	`{`
`178`	`174`	`_vmRemote.CmdEndRenaming.Execute();`