修复菜单没有对齐的问题

DearVa · Jul 14, 2022 · f24b0db · f24b0db
1 parent f0be4c8
commit f24b0db
Show file tree

Hide file tree

Showing 14 changed files with 112 additions and 100 deletions.
diff --git a/ExplorerEx/App.xaml b/ExplorerEx/App.xaml
@@ -26,8 +26,8 @@
  <c:Bytes2StringConverter x:Key="Bytes2StringConverter"/>
 
  <Style x:Key="ButtonLikeMenuItem" TargetType="MenuItem">
- <Setter Property="Width" Value="40"/>
- <Setter Property="Height" Value="35"/>
+ <Setter Property="Width" Value="38"/>
+ <Setter Property="Height" Value="34"/>
  <Setter Property="Template">
  <Setter.Value>
  <ControlTemplate TargetType="MenuItem">

diff --git a/ExplorerEx/Model/FileItem/Bookmark.cs b/ExplorerEx/Model/FileItem/Bookmark.cs
@@ -9,6 +9,8 @@
 using ExplorerEx.Converter;
 using ExplorerEx.Utils;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Options;
+using static ExplorerEx.Model.FileListViewItem;
 using static ExplorerEx.Utils.IconHelper;
 
 namespace ExplorerEx.Model;
@@ -79,11 +81,11 @@ public class BookmarkItem : FileListViewItem, IFilterable {
  category.AddBookmark(this);
  }
 
- public override void LoadAttributes() {
+ public override void LoadAttributes(LoadDetailsOptions options) {
  throw new InvalidOperationException();
  }
 
- public override void LoadIcon() {
+ public override void LoadIcon(LoadDetailsOptions options) {
  if (FullPath.Length == 3) {
  IsFolder = true;
  Icon = GetPathThumbnail(FullPath);
@@ -144,7 +146,7 @@ public class BookmarkDbContext : DbContext {
  }
  await Task.Run(() => {
  foreach (var item in BookmarkDbSet.Local) {
- item.LoadIcon();
+ item.LoadIcon(LoadDetailsOptions.Default);
  }
  });
  } catch (Exception e) {

diff --git a/ExplorerEx/Model/FileItem/DiskDriveItem.cs b/ExplorerEx/Model/FileItem/DiskDriveItem.cs
@@ -41,7 +41,7 @@ public sealed class DiskDriveItem : FolderItem {
  Name = drive.Name;
  }
 
- public override void LoadAttributes() {
+ public override void LoadAttributes(LoadDetailsOptions options) {
  Type = DriveUtils.GetTypeDescription(Drive);
  if (Drive.IsReady) {
  TotalSpace = Drive.TotalSize;
@@ -56,7 +56,7 @@ public sealed class DiskDriveItem : FolderItem {
  UpdateUI(nameof(SpaceOverviewString));
  }
 
- public override void LoadIcon() {
+ public override void LoadIcon(LoadDetailsOptions options) {
  Icon = IconHelper.GetPathThumbnail(Drive.Name);
  }
 

diff --git a/ExplorerEx/Model/FileItem/FileListViewItem.cs b/ExplorerEx/Model/FileItem/FileListViewItem.cs
@@ -91,12 +91,12 @@ public abstract class FileListViewItem : SimpleNotifyPropertyChanged {
  /// <summary>
  /// 加载文件的各项属性
  /// </summary>
- public abstract void LoadAttributes();
+ public abstract void LoadAttributes(LoadDetailsOptions options);
 
  /// <summary>
  /// LoadIcon用到了shell，那并不是一个可以多线程的方法，所以与其每次都Task.Run，不如提高粗粒度
  /// </summary>
- public abstract void LoadIcon();
+ public abstract void LoadIcon(LoadDetailsOptions options);
 
  #region 文件重命名
  /// <summary>
@@ -142,7 +142,7 @@ public abstract class FileListViewItem : SimpleNotifyPropertyChanged {
  /// <param name="token"></param>
  /// <param name="useLargeIcon"></param>
  /// <returns></returns>
- public static async Task LoadDetails(IReadOnlyCollection<FileListViewItem> list, CancellationToken token, bool useLargeIcon) {
+ public static async Task LoadDetails(IReadOnlyCollection<FileListViewItem> list, CancellationToken token, LoadDetailsOptions options) {
  try {
  if (list.Count > 0) {
  await Task.WhenAll(Partitioner.Create(list).GetPartitions(4).Select(partition => Task.Run(() => {
@@ -152,12 +152,8 @@ public abstract class FileListViewItem : SimpleNotifyPropertyChanged {
  using (partition) {
  while (partition.MoveNext()) {
  var item = partition.Current!;
- item.LoadAttributes();
-
- if (item is FileItem fileItem) {
- fileItem.UseLargeIcon = useLargeIcon;
- }
- item.LoadIcon();
+ item.LoadAttributes(options);
+ item.LoadIcon(options);
 
  if (token.IsCancellationRequested) {
  return Task.FromCanceled(token);
@@ -174,6 +170,18 @@ public abstract class FileListViewItem : SimpleNotifyPropertyChanged {
  Logger.Exception(e);
  }
  }
+
+
+ /// <summary>
+ /// 加载详细信息时的设置，例如是否使用大图标
+ /// </summary>
+ public class LoadDetailsOptions {
+ public static LoadDetailsOptions Default { get; } = new() {
+ UseLargeIcon = false
+ };
+
+ public bool UseLargeIcon { get; set; }
+ }
 }
 
 public class FileItemAttach {

diff --git a/ExplorerEx/Model/FileItem/FileSystemItem.cs b/ExplorerEx/Model/FileItem/FileSystemItem.cs
@@ -64,12 +64,15 @@ public abstract class FileSystemItem : FileListViewItem {
  return false;
  }
 
- public void Refresh() {
+ /// <summary>
+ /// 重新加载图标和详细信息
+ /// </summary>
+ public void Refresh(LoadDetailsOptions options) {
  if (!IsFolder) {
- LoadIcon();
+ LoadIcon(options);
  }
  UpdateUI(nameof(Icon));
- LoadAttributes();
+ LoadAttributes(options);
  }
 }
 
@@ -95,11 +98,6 @@ public class FileItem : FileSystemItem {
 
  public override string DisplayText => Name;
 
- /// <summary>
- /// 是否使用大图标
- /// </summary>
- public bool UseLargeIcon { get; set; }
-
  protected FileItem() { }
 
  public FileItem(FileInfo fileInfo) {
@@ -111,7 +109,7 @@ public class FileItem : FileSystemItem {
  Icon = UnknownFileDrawingImage;
  }
 
- public override void LoadAttributes() {
+ public override void LoadAttributes(LoadDetailsOptions options) {
  if (FileInfo == null) {
  return;
  }
@@ -126,8 +124,8 @@ public class FileItem : FileSystemItem {
  DateCreated = FileInfo.CreationTime;
  }
 
- public override void LoadIcon() {
- if (UseLargeIcon) {
+ public override void LoadIcon(LoadDetailsOptions options) {
+ if (options.UseLargeIcon) {
  Icon = GetPathThumbnail(FullPath);
  } else {
  Icon = GetSmallIcon(FullPath, false);
@@ -206,7 +204,7 @@ public class FolderItem : FileSystemItem {
 
  public override string DisplayText => Name;
 
- public override void LoadAttributes() {
+ public override void LoadAttributes(LoadDetailsOptions options) {
  isEmptyFolder = FolderUtils.IsEmptyFolder(FullPath);
  Type = isEmptyFolder ? "EmptyFolder".L() : "Folder".L();
  IsEmptyFolderDictionary.Add(FullPath, isEmptyFolder);
@@ -215,7 +213,7 @@ public class FolderItem : FileSystemItem {
  DateCreated = directoryInfo.CreationTime;
  }
 
- public override void LoadIcon() {
+ public override void LoadIcon(LoadDetailsOptions options) {
  if (isEmptyFolder) {
  Icon = EmptyFolderDrawingImage;
  } else {

diff --git a/ExplorerEx/Model/FileItem/FolderOnlyItem.cs b/ExplorerEx/Model/FileItem/FolderOnlyItem.cs
@@ -9,6 +9,7 @@
 using System.Threading.Tasks;
 using System.Windows;
 using ExplorerEx.Utils;
+using Microsoft.Extensions.Options;
 
 namespace ExplorerEx.Model;
 
@@ -101,11 +102,11 @@ internal sealed class FolderOnlyItem : FileListViewItem {
  Application.Current.Dispatcher.Invoke(() => actualChildren = new ObservableCollection<FolderOnlyItem>());
  }
 
- public override void LoadAttributes() {
+ public override void LoadAttributes(LoadDetailsOptions options) {
  throw new InvalidOperationException();
  }
 
- public override void LoadIcon() {
+ public override void LoadIcon(LoadDetailsOptions options) {
  if (zipPath != null) {
  if (relativePath == string.Empty) {
  Icon = IconHelper.GetSmallIcon(".zip", true);
@@ -217,7 +218,7 @@ internal sealed class FolderOnlyItem : FileListViewItem {
  if (token.IsCancellationRequested) {
  return;
  }
- item.LoadIcon();
+ item.LoadIcon(LoadDetailsOptions.Default);
  }
  }
  }, token);

diff --git a/ExplorerEx/Model/FileItem/HomeFolderItem.cs b/ExplorerEx/Model/FileItem/HomeFolderItem.cs
@@ -35,11 +35,11 @@ internal sealed class HomeFolderItem : FolderItem, ISpecialFolder {
 
  public override string DisplayText => Name;
 
- public override void LoadAttributes() {
+ public override void LoadAttributes(LoadDetailsOptions options) {
  throw new InvalidOperationException();
  }
 
- public override void LoadIcon() { }
+ public override void LoadIcon(LoadDetailsOptions options) { }
 
  protected override bool InternalRename(string newName) {
  throw new InvalidOperationException();

diff --git a/ExplorerEx/Model/FileItem/RecycleBinItem.cs b/ExplorerEx/Model/FileItem/RecycleBinItem.cs
@@ -41,14 +41,20 @@ public sealed class RecycleBinItem : FileListViewItem, IFilterable {
  });
  }
 
- public override void LoadAttributes() {
+ public override void LoadAttributes(LoadDetailsOptions options) {
  throw new InvalidOperationException();
  }
 
- public override void LoadIcon() {
+ public override void LoadIcon(LoadDetailsOptions options) {
  var shFileInfo = new ShFileInfo();
  lock (ShellLock) {
- var hr = SHGetFileInfo(pidl, 0, ref shFileInfo, Marshal.SizeOf<ShFileInfo>(), SHGFI.Icon | SHGFI.SmallIcon | SHGFI.Pidl);
+ var flags = SHGFI.Icon | SHGFI.Pidl;
+ if (options.UseLargeIcon) {
+ flags |= SHGFI.LargeIcon;
+ } else {
+ flags |= SHGFI.SmallIcon;
+ }
+ var hr = SHGetFileInfo(pidl, 0, ref shFileInfo, Marshal.SizeOf<ShFileInfo>(), flags);
  if (hr < 0) {
  Icon = IconHelper.UnknownFileDrawingImage;
  } else {
@@ -150,7 +156,7 @@ public sealed class RecycleBinItem : FileListViewItem, IFilterable {
  break;
  }
  var item = new RecycleBinItem(pidl);
- item.LoadIcon();
+ item.LoadIcon(LoadDetailsOptions.Default);
  dispatcher.Invoke(() => Items.Add(item));
  }
  Marshal.ReleaseComObject(enumFiles);

diff --git a/ExplorerEx/Model/FileItem/ZipItem.cs b/ExplorerEx/Model/FileItem/ZipItem.cs
@@ -29,11 +29,11 @@ public class ZipFileItem : FileItem {
  extension = Path.GetExtension(zipArchiveEntry.Name);
  }
 
- public override void LoadAttributes() {
+ public override void LoadAttributes(LoadDetailsOptions options) {
  Type = FileUtils.GetFileTypeDescription(extension);
  }
 
- public override void LoadIcon() {
+ public override void LoadIcon(LoadDetailsOptions options) {
  Icon = IconHelper.GetSmallIcon(extension, true);
  }
 
@@ -80,9 +80,9 @@ public class ZipFolderItem : FolderItem, IDisposable {
  this.relativePath = relativePath;
  }
 
- public override void LoadAttributes() { }
+ public override void LoadAttributes(LoadDetailsOptions options) { }
 
- public override void LoadIcon() {
+ public override void LoadIcon(LoadDetailsOptions options) {
  if (relativePath == string.Empty) {
  Icon = IconHelper.GetSmallIcon(".zip", true);
  } else if (hasItems) {

diff --git a/ExplorerEx/View/Controls/FileListView.xaml b/ExplorerEx/View/Controls/FileListView.xaml
@@ -302,7 +302,7 @@
  </c:FileAssocTemplateSelector>
 
  <ContextMenu x:Key="FileItemContextMenu" d:DataContext="{d:DesignInstance ct:FileListView}">
- <MenuItem Height="45" Template="{StaticResource FileOperationsTemplate}"/>
+ <MenuItem Height="40" Template="{StaticResource FileOperationsTemplate}"/>
  <Separator Style="{StaticResource SeparatorBaseStyle}"/>
 
  <MenuItem Header="{u:Lang Open}" CommandParameter="Open"
@@ -507,8 +507,6 @@
  <hc:SimplePanel Background="Transparent">
  <TextBlock Text="{u:Lang ThisIsAnEmptyFolder}" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="14"
  Visibility="{Binding Path=ViewModel.(vm:FileTabViewModel.IsLoading), Mode=OneWay, RelativeSource={RelativeSource AncestorType=ct:FileListView}, Converter={StaticResource Boolean2VisibilityReConverter}}"/>
- <TextBlock Text="{u:Lang Loading}" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="14"
- Visibility="{Binding Path=ViewModel.(vm:FileTabViewModel.IsLoading), Mode=OneWay, RelativeSource={RelativeSource AncestorType=ct:FileListView}, Converter={StaticResource Boolean2VisibilityConverter}}"/>
  </hc:SimplePanel>
  </hc:ToggleBlock.UnCheckedContent>
  </hc:ToggleBlock>

diff --git a/ExplorerEx/View/MainWindow.xaml.cs b/ExplorerEx/View/MainWindow.xaml.cs
@@ -466,7 +466,7 @@ public sealed partial class MainWindow {
  var item = new BookmarkItem(bookmarkItem, window.BookmarkName, categoryItem);
  await bookmarkDb.BookmarkDbSet.AddAsync(item);
  await bookmarkDb.SaveChangesAsync();
- item.LoadIcon();
+ item.LoadIcon(FileListViewItem.LoadDetailsOptions.Default);
  }
  foreach (var updateItem in MainWindows.SelectMany(mw => mw.SplitGrid).SelectMany(f => f.TabItems).SelectMany(i => i.Items).Where(i => i.FullPath == fullPath)) {
  updateItem.UpdateUI(nameof(updateItem.IsBookmarked));