Skip to content

Fix drag mechanism in Plugin Management Menu #894

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Cryotechnic wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Fix drag mechanism in Plugin Management Menu #894

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6716e72
Update i18n for drag-n-drop plugin window
Cryotechnic Jul 15, 2026
7e98591
Add new drop indicator overlay in plugin window
Cryotechnic Jul 15, 2026
7f35ae4
Add file drag-and-drop support to WindowUtility
Cryotechnic Jul 15, 2026
9301d8f
Add drag-and-drop import & refactor import logic
Cryotechnic Jul 15, 2026
2aa513b
Improve error handling for plugin imports
Cryotechnic Jul 16, 2026
883fdc9
Remove foreground window check in drag logic
Cryotechnic Jul 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
127 changes: 126 additions & 1 deletion CollapseLauncher/Classes/Helper/WindowUtility.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,10 @@ internal enum WindowBackdropKind
}

internal delegate nint WndProcDelegate(nint hwnd, uint msg, nuint wParam, nint lParam);
internal static class WindowUtility
internal static partial class WindowUtility
{
private static event EventHandler<RectInt32[]>? DragAreaChangeEvent;
internal static event Action<string[], PointInt32>? FileDropEvent;

private static nint _oldMainWndProcPtr;
private static nint _oldDesktopSiteBridgeWndProcPtr;
Expand Down Expand Up @@ -417,6 +418,52 @@ internal static void RegisterWindow(this Window window)
FileDialogNative.InitHandlerPointer(CurrentWindowPtr);
}

internal static void SetFileDropEnabled(bool isEnabled)
{
const uint WM_COPYDATA = 0x004A;
const uint WM_COPYGLOBALDATA = 0x0049;
const uint WM_DROPFILES = 0x0233;
const uint MSGFLT_RESET = 0;
const uint MSGFLT_ALLOW = 1;

nint windowHandle = CurrentWindowPtr;
if (windowHandle == nint.Zero)
{
return;
}

uint messageFilterAction = isEnabled ? MSGFLT_ALLOW : MSGFLT_RESET;
NativeFileDrop.ChangeWindowMessageFilterEx(windowHandle, WM_DROPFILES, messageFilterAction, nint.Zero);
NativeFileDrop.ChangeWindowMessageFilterEx(windowHandle, WM_COPYDATA, messageFilterAction, nint.Zero);
NativeFileDrop.ChangeWindowMessageFilterEx(windowHandle, WM_COPYGLOBALDATA, messageFilterAction, nint.Zero);
NativeFileDrop.DragAcceptFiles(windowHandle, isEnabled);
}

internal static bool TryGetExternalDragPosition(out PointInt32 dragPosition)
{
const int VK_LBUTTON = 0x01;
const int VK_RBUTTON = 0x02;
const int KeyPressed = 0x8000;

dragPosition = default;
nint windowHandle = CurrentWindowPtr;
if (windowHandle == nint.Zero)
{
return false;
}

bool isMouseButtonPressed = (NativeFileDrop.GetAsyncKeyState(VK_LBUTTON) & KeyPressed) != 0 ||
(NativeFileDrop.GetAsyncKeyState(VK_RBUTTON) & KeyPressed) != 0;
if (!isMouseButtonPressed || !NativeFileDrop.GetCursorPos(out NativePoint cursorPosition))
{
return false;
}

NativeFileDrop.ScreenToClient(windowHandle, ref cursorPosition);
dragPosition = new PointInt32(cursorPosition.X, cursorPosition.Y);
return true;
}

#region Drag Area Handler

private static void InstallDragAreaChangeMonitor()
Expand Down Expand Up @@ -496,6 +543,7 @@ private static nint MainWndProc(nint hwnd, uint msg, nuint wParam, nint lParam)
const uint WM_ACTIVATE = 0x0006;
const uint WM_QUERYENDSESSION = 0x0011;
const uint WM_ENDSESSION = 0x0016;
const uint WM_DROPFILES = 0x0233;

switch (msg)
{
Expand Down Expand Up @@ -643,11 +691,88 @@ private static nint MainWndProc(nint hwnd, uint msg, nuint wParam, nint lParam)
(CurrentWindow as MainWindow)?.CloseApp();
}
break;
case WM_DROPFILES:
HandleFileDrop((nint)wParam);
return 0;
}

return PInvoke.CallWindowProc(_oldMainWndProcPtr, hwnd, msg, wParam, lParam);
}

private static unsafe void HandleFileDrop(nint dropHandle)
{
const uint GetFileCount = uint.MaxValue;

try
{
int fileCount = (int)NativeFileDrop.DragQueryFile(dropHandle, GetFileCount, null, 0);
string[] files = new string[fileCount];
for (int i = 0; i < fileCount; i++)
{
uint filePathLength = NativeFileDrop.DragQueryFile(dropHandle, (uint)i, null, 0);
char[] filePathBuffer = new char[filePathLength + 1];
fixed (char* filePathBufferPtr = filePathBuffer)
{
NativeFileDrop.DragQueryFile(dropHandle, (uint)i, filePathBufferPtr, (uint)filePathBuffer.Length);
files[i] = new string(filePathBufferPtr, 0, (int)filePathLength);
}
}

NativeFileDrop.DragQueryPoint(dropHandle, out NativePoint dropPoint);
FileDropEvent?.Invoke(files, new PointInt32(dropPoint.X, dropPoint.Y));
}

@bagusnl bagusnl Jul 17, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might want to catch any error during the file drop just in case so that

  1. User knows (error message or dialog, telling them to select a file instead using the old mechanism)
  2. We knows (Sentry capture)

finally
{
NativeFileDrop.DragFinish(dropHandle);
}
}

private static unsafe partial class NativeFileDrop
{
[LibraryImport("shell32.dll")]

@bagusnl bagusnl Jul 17, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It will be much appreciated if all of the static imports is moved towards the submodule Hi3Helper.Win32/Native so we have less unsafe method in the main project

[DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
internal static partial void DragAcceptFiles(nint windowHandle, [MarshalAs(UnmanagedType.Bool)] bool acceptFiles);

[LibraryImport("shell32.dll", EntryPoint = "DragQueryFileW")]
[DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
internal static partial uint DragQueryFile(nint dropHandle, uint fileIndex, char* filePath, uint filePathLength);

[LibraryImport("shell32.dll")]
[DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
[return: MarshalAs(UnmanagedType.Bool)]
internal static partial bool DragQueryPoint(nint dropHandle, out NativePoint dropPoint);

[LibraryImport("shell32.dll")]
[DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
internal static partial void DragFinish(nint dropHandle);

[LibraryImport("user32.dll")]
[DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
[return: MarshalAs(UnmanagedType.Bool)]
internal static partial bool ChangeWindowMessageFilterEx(nint windowHandle, uint message, uint action, nint changeFilterStruct);

[LibraryImport("user32.dll")]
[DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
internal static partial short GetAsyncKeyState(int virtualKey);

[LibraryImport("user32.dll")]
[DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
[return: MarshalAs(UnmanagedType.Bool)]
internal static partial bool GetCursorPos(out NativePoint cursorPosition);

[LibraryImport("user32.dll")]
[DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
[return: MarshalAs(UnmanagedType.Bool)]
internal static partial bool ScreenToClient(nint windowHandle, ref NativePoint cursorPosition);
}

[StructLayout(LayoutKind.Sequential)]
private struct NativePoint
{
internal int X;

@bagusnl bagusnl Jul 17, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

By MSFT documentation, the type for tagPOINT is long, is there a specific reason why we use int instead?
https://learn.microsoft.com/en-us/windows/win32/api/windef/ns-windef-point

internal int Y;
}

#endregion

#region Titlebar Methods
Expand Down
73 changes: 61 additions & 12 deletions CollapseLauncher/Classes/Plugins/PluginImporter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using Hi3Helper.Plugin.Core.Update;
using Hi3Helper.Shared.Region;
using CollapseLauncher.Helper.StreamUtility;
using System;
using System.Data;
using System.IO;
Expand All @@ -15,6 +16,14 @@ internal static partial class PluginImporter
public static async Task<PluginInfo> AutoGetImportFromPath(string filePath, CancellationToken token)
{
bool isFromPackage = filePath.EndsWith(".zip", StringComparison.OrdinalIgnoreCase);
bool isFromManifest = string.Equals(Path.GetFileName(filePath),
PluginManager.ManifestPrefix,
StringComparison.OrdinalIgnoreCase);

if (!isFromPackage && !isFromManifest)
{
throw new NotSupportedException($"{Path.GetFileName(filePath)} is not supported. Import a .zip package or a file named manifest.json.");
}

using IPluginSource pluginSource = isFromPackage ?
await ZipPluginSource.GetSourceFrom(filePath, token) :
Expand All @@ -24,6 +33,7 @@ await ZipPluginSource.GetSourceFrom(filePath, token) :
string pluginDirName = $"Hi3Helper.Plugin.{pluginExecNameNoExt}";
string pluginBaseDir = Path.Combine(LauncherConfig.AppPluginFolder, pluginDirName);
string pluginRelName = Path.Combine(pluginDirName, pluginSource.Manifest.MainLibraryName);
string pluginEntryPath = GetContainedPath(pluginBaseDir, pluginSource.Manifest.MainLibraryName);

if (PluginManager.PluginInstances.ContainsKey(pluginBaseDir) ||
PluginManager.PluginInstances.Values
Expand All @@ -44,25 +54,64 @@ await ZipPluginSource.GetSourceFrom(filePath, token) :
});
}

string pluginEntryPath = Path.Combine(pluginBaseDir, pluginSource.Manifest.MainLibraryName);
foreach (PluginManifestAssetInfo asset in pluginSource.Manifest.Assets)
Directory.CreateDirectory(LauncherConfig.AppPluginFolder);
string stagingDir = Path.Combine(LauncherConfig.AppPluginFolder, $".import-{Guid.NewGuid():N}");
string cleanupDir = stagingDir;

try
{
string assetFullPath = Path.Combine(pluginBaseDir, asset.FilePath);
string? assetFullDir = Path.GetDirectoryName(assetFullPath);
foreach (PluginManifestAssetInfo asset in pluginSource.Manifest.Assets)
{
string assetFullPath = GetContainedPath(stagingDir, asset.FilePath);
string? assetFullDir = Path.GetDirectoryName(assetFullPath);

if (!string.IsNullOrEmpty(assetFullDir))
{
Directory.CreateDirectory(assetFullDir);
}

await using FileStream assetStream = File.Create(assetFullPath);
await using Stream assetPluginSourceStream = await pluginSource.GetAssetStream(asset, token);

await assetPluginSourceStream.CopyToAsync(assetStream, token);
}

Directory.Move(stagingDir, pluginBaseDir);
cleanupDir = pluginBaseDir;

if (!string.IsNullOrEmpty(assetFullDir))
PluginInfo pluginInfo = new(pluginEntryPath,
pluginRelName,
pluginSource.Manifest);
cleanupDir = string.Empty;
return pluginInfo;
}
catch
{
if (!string.IsNullOrEmpty(cleanupDir))
{
Directory.CreateDirectory(assetFullDir);
new DirectoryInfo(cleanupDir).TryDeleteDirectory(true);
}

await using FileStream assetStream = File.Create(assetFullPath);
await using Stream assetPluginSourceStream = await pluginSource.GetAssetStream(asset, token);
throw;
}
}

private static string GetContainedPath(string baseDirectory, string relativePath)
{
if (string.IsNullOrWhiteSpace(relativePath))
{
throw new InvalidDataException("The plugin manifest contains an empty file path.");
}

await assetPluginSourceStream.CopyToAsync(assetStream, token);
string baseFullPath = Path.TrimEndingDirectorySeparator(Path.GetFullPath(baseDirectory));
string fileFullPath = Path.GetFullPath(relativePath, baseFullPath);
string basePrefix = baseFullPath + Path.DirectorySeparatorChar;

if (!fileFullPath.StartsWith(basePrefix, StringComparison.OrdinalIgnoreCase))
{
throw new InvalidDataException($"The plugin manifest path '{relativePath}' points outside the plugin directory.");
}

return new PluginInfo(pluginEntryPath,
pluginRelName,
pluginSource.Manifest);
return fileFullPath;
}
}
27 changes: 25 additions & 2 deletions CollapseLauncher/XAMLs/MainApp/Pages/PluginManagerPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -823,12 +823,17 @@
</ResourceDictionary>
</Grid.Resources>
<Button x:Name="ImportBoxButton"
AllowDrop="True"
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"
extension:UIElementExtensions.CursorType="Hand"
Background="{StaticResource ImportBoxButtonBackground}"
Click="OnClickImportButton"
CornerRadius="20">
CornerRadius="20"
DragEnter="OnDragEnterImportBox"
DragLeave="OnDragLeaveImportBox"
DragOver="OnDragOverImportBox"
Drop="OnDropImportBox">
<interactivity:Interaction.Behaviors>
<interactivity:EventTriggerBehavior EventName="PointerEntered">
<behaviors:StartAnimationAction Animation="{x:Bind ImportBoxPlusGridEnterAnimation}" />
Expand Down Expand Up @@ -906,7 +911,7 @@
</animations:AnimationSet>
</animations:Explicit.Animations>

<FontIcon FontSize="48z"
<FontIcon FontSize="48"
Glyph="&#xE710;" />
</Button>
<StackPanel Grid.Row="1"
Expand Down Expand Up @@ -938,6 +943,24 @@
</StackPanel>
</Grid>
</Button>
<Grid x:Name="ImportDropIndicator"
IsHitTestVisible="False"
Opacity="0">
<Grid.OpacityTransition>
<ScalarTransition Duration="0:0:.18" />
</Grid.OpacityTransition>
<Border Margin="3"
Background="{ThemeResource AccentFillColorDefaultBrush}"
CornerRadius="17"
Opacity=".08" />
<Rectangle Margin="2"
RadiusX="18"
RadiusY="18"
Stroke="{ThemeResource AccentColor}"
StrokeDashArray="1,2"
StrokeDashCap="Round"
StrokeThickness="3" />
</Grid>
</Grid>
<Button x:Name="OpenPluginCatalogBottomLeftButton"
Grid.Column="0"
Expand Down
Loading
Loading