From b15c3e1da25526fb8d0c7b39a63521427a7eb11e Mon Sep 17 00:00:00 2001
From: Open-KFC <1811593346@qq.com>
Date: Tue, 13 May 2025 06:51:34 +0800
Subject: [PATCH] =?UTF-8?q?fix(FileDrag):=20=E7=94=A8=E6=88=B7=E6=97=A0?=
=?UTF-8?q?=E6=B3=95=E5=B0=86=E6=96=87=E4=BB=B6=E6=8B=96=E6=94=BE=E5=88=B0?=
=?UTF-8?q?=E5=8F=AF=E7=BC=96=E8=BE=91=E6=96=87=E5=AD=97=E6=8E=A7=E4=BB=B6?=
=?UTF-8?q?=E4=B8=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Plain Craft Launcher 2/FormMain.xaml.vb | 50 ++++++++++++++++++++++---
1 file changed, 44 insertions(+), 6 deletions(-)
diff --git a/Plain Craft Launcher 2/FormMain.xaml.vb b/Plain Craft Launcher 2/FormMain.xaml.vb
index 7cbbc0f9b..e17416314 100644
--- a/Plain Craft Launcher 2/FormMain.xaml.vb
+++ b/Plain Craft Launcher 2/FormMain.xaml.vb
@@ -211,6 +211,9 @@ Public Class FormMain
'刷新主题
ThemeCheckAll(False)
Setup.Load("UiLauncherTheme")
+ '注册一些事件
+ [AddHandler](DragDrop.DragEnterEvent, New DragEventHandler(AddressOf HandleDragEnter), handledEventsToo:=True)
+ [AddHandler](DragDrop.DragOverEvent, New DragEventHandler(AddressOf HandleDragOver), handledEventsToo:=True)
'加载 UI
InitializeComponent()
Opacity = 0
@@ -651,14 +654,46 @@ Public Class FormMain
End Sub
'文件拖放
- Private Sub FrmMain_PreviewDragOver(sender As Object, e As DragEventArgs) Handles Me.PreviewDragOver
- If e.Data.GetFormats.Contains("FileDrop") Then
- e.Effects = DragDropEffects.Link
- Else
- e.Effects = DragDropEffects.None
+ Private Sub HandleDragEnter(sender As Object, e As DragEventArgs)
+ ProcessDragEventLast(sender, e)
+ End Sub
+ Private Sub HandleDragOver(sender As Object, e As DragEventArgs)
+ ProcessDragEventLast(sender, e)
+ End Sub
+ '''
+ ''' 被窗口关心的文件拖动，以及它们对应的拖动类型
+ '''
+ Private Function ComputeMouseEffectFromDraggingData(Data As IDataObject) As DragDropEffects
+ If Data.GetDataPresent(DataFormats.Text) Then
+ Dim Str As String = Data.GetData(DataFormats.Text)
+ If Str.StartsWithF("authlib-injector:yggdrasil-server:") Then Return DragDropEffects.Copy
+ If Str.StartsWithF("file:///") Then Return DragDropEffects.Copy
+ ElseIf Data.GetDataPresent(DataFormats.FileDrop) Then
+ Dim Files As String() = Data.GetData(DataFormats.FileDrop)
+ If Files IsNot Nothing AndAlso Files.Length > 0 Then Return DragDropEffects.Link
End If
+ Return DragDropEffects.None
+ End Function
+ '''
+ ''' 在子元素完成处理之后处理那些子元素不关心或子元素无法接收的拖拽文件
+ '''
+ Private Sub ProcessDragEventLast(sender As Object, e As DragEventArgs)
+ Try
+ If e.Handled AndAlso (e.Effects <> DragDropEffects.None) Then Exit Sub
+ If Not e.Handled Then e.Handled = True
+ Static PrevData As IDataObject, PrevEffects As DragDropEffects '不知道这 cache 会不会出问题，但是这段代码调用频率挺高的
+ If e.Data Is PrevData Then
+ e.Effects = PrevEffects
+ Else
+ e.Effects = ComputeMouseEffectFromDraggingData(e.Data)
+ PrevData = e.Data
+ PrevEffects = e.Effects
+ End If
+ Catch ex As Exception
+ Log(ex, "处理文件拖放鼠标效果时的未知错误", LogLevel.Feedback)
+ End Try
End Sub
- Private Sub FrmMain_Drop(sender As Object, e As DragEventArgs) Handles Me.PreviewDrop
+ Private Sub FrmMain_Drop(sender As Object, e As DragEventArgs) Handles Me.Drop
Try
If e.Data.GetDataPresent(DataFormats.Text) Then
'获取文本
@@ -668,6 +703,7 @@ Public Class FormMain
If Str.StartsWithF("authlib-injector:yggdrasil-server:") Then
'Authlib 拖拽
e.Handled = True
+ e.Effects = DragDropEffects.Copy
Dim AuthlibServer As String = Net.WebUtility.UrlDecode(Str.Substring("authlib-injector:yggdrasil-server:".Length))
Log("[System] Authlib 拖拽：" & AuthlibServer)
If Not String.IsNullOrEmpty(New ValidateHttp().Validate(AuthlibServer)) Then
@@ -712,6 +748,7 @@ Public Class FormMain
'文件拖拽（例如从浏览器下载窗口拖入）
Dim FilePath = Net.WebUtility.UrlDecode(Str).Substring("file:///".Length).Replace("/", "\")
e.Handled = True
+ e.Effects = DragDropEffects.Copy
FileDrag(New List(Of String) From {FilePath})
End If
Catch ex As Exception
@@ -726,6 +763,7 @@ Public Class FormMain
Exit Sub
End If
e.Handled = True
+ e.Effects = DragDropEffects.Link
FileDrag(CType(FilePathRaw, IEnumerable(Of String)))
End If
Catch ex As Exception