michael/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit.git synced 2024-11-01 13:13:21 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

optimize<FolderDialog>: use default location instead of Desktop when open FolderDialog

Browse source
This commit is contained in:
leo 2021-05-26 11:16:34 +08:00
parent 6061f5a074
commit e3ac11a01b
1 changed files with 1 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/Views/Controls/FolderDialog.cs
View file

@ -46,9 +46,6 @@ namespace SourceGit.Views.Controls {
/// </summary> /// </summary>
[SuppressUnmanagedCodeSecurity] [SuppressUnmanagedCodeSecurity]
internal static class Shell32 { internal static class Shell32 {
[DllImport("shell32.dll")]
public static extern Int32 SHGetSpecialFolderLocation(IntPtr hwnd, Int32 csidl, ref IntPtr ppidl);
[DllImport("shell32.dll", CharSet = CharSet.Auto)] [DllImport("shell32.dll", CharSet = CharSet.Auto)]
public static extern Boolean SHGetPathFromIDList(IntPtr pidl, IntPtr pszPath); public static extern Boolean SHGetPathFromIDList(IntPtr pidl, IntPtr pszPath);
@ -81,22 +78,12 @@ namespace SourceGit.Views.Controls {
} }
protected override bool RunDialog(IntPtr hwndOwner) { protected override bool RunDialog(IntPtr hwndOwner) {
IntPtr ppidl = IntPtr.Zero;
Shell32.SHGetSpecialFolderLocation(hwndOwner, (Int32)Environment.SpecialFolder.Desktop, ref ppidl);
if (ppidl == IntPtr.Zero) {
Shell32.SHGetSpecialFolderLocation(hwndOwner, 0, ref ppidl);
if (ppidl == IntPtr.Zero) {
Models.Exception.Raise("Failed to open folder dialog!!!");
return false;
}
}
BrowseCallbackProc callback = new BrowseCallbackProc(BrowseCallbackHandler); BrowseCallbackProc callback = new BrowseCallbackProc(BrowseCallbackHandler);
IntPtr displayName = Marshal.AllocHGlobal(260 * Marshal.SystemDefaultCharSize); IntPtr displayName = Marshal.AllocHGlobal(260 * Marshal.SystemDefaultCharSize);
bool ok = false; bool ok = false;
try { try {
var info = new BrowseInfo(); var info = new BrowseInfo();
info.pidlRoot = ppidl; info.pidlRoot = IntPtr.Zero;
info.hwndOwner = hwndOwner; info.hwndOwner = hwndOwner;
info.pszDisplayName = displayName; info.pszDisplayName = displayName;
info.lpszTitle = Description; info.lpszTitle = Description;
@ -119,7 +106,6 @@ namespace SourceGit.Views.Controls {
Ole32.CoTaskMemFree(result); Ole32.CoTaskMemFree(result);
} }
} finally { } finally {
Ole32.CoTaskMemFree(ppidl);
if (displayName != IntPtr.Zero) Marshal.FreeHGlobal(displayName); if (displayName != IntPtr.Zero) Marshal.FreeHGlobal(displayName);
callback = null; callback = null;
} }