CodeMirror/SystemTrayMenu
1
0
Fork 0
mirror of https://github.com/Hofknecht/SystemTrayMenu.git synced 2024-05-29 08:39:34 +12:00
Code Issues Projects Releases Wiki Activity

[Feature] Increase performance of huge folders by iconcache #44, [Feature] CodeBuity&Refactor #49, [Feature] Code review tool #10

Browse source
This commit is contained in:
Markus Hofknecht 2020-03-30 01:19:11 +02:00
parent 1ce126ddc3
commit e39bbd3696
3 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Business/SystemTrayMenu.cs
View file

@ -219,6 +219,7 @@ namespace SystemTrayMenu
fastLeave.Dispose();
DisposeMenu(menus[0]);
dgvFromLastMouseEvent?.Dispose();
IconReader.Dispose();
}
private void DisposeMenu(Menu menuToDispose)

13
DataClasses/RowData.cs
View file

@ -18,11 +18,11 @@ namespace SystemTrayMenu.DataClasses
{
internal class RowData : IDisposable
{
#warning check if we can put some variables to private instead internal
internal event Action<object, EventArgs> OpenMenu;
internal BackgroundWorker Reading = new BackgroundWorker();
internal FileInfo FileInfo;
internal Menu SubMenu;
internal Icon Icon;
internal bool IsSelected;
internal bool IsSelectedByKeyboard;
internal bool ContainsMenu;
@ -39,6 +39,8 @@ namespace SystemTrayMenu.DataClasses
internal string Text;
internal int RowIndex;
private readonly WaitMenuOpen waitMenuOpen = new WaitMenuOpen();
private Icon Icon = null;
private bool diposeIcon = true;
private bool isDisposed = false;
internal RowData()
@ -63,7 +65,7 @@ namespace SystemTrayMenu.DataClasses
if (Icon == null)
{
Icon = (Icon)Properties.Resources.SystemTrayMenu.Clone();
Icon = (Icon)Properties.Resources.SystemTrayMenu;
}
DataGridViewImageCell cellIcon =
(DataGridViewImageCell)row.Cells[0];
@ -122,6 +124,7 @@ namespace SystemTrayMenu.DataClasses
try
{
Icon = IconReader.GetFileIconWithCache(TargetFilePath, false);
diposeIcon = false;
// other project -> fails sometimes
//icon = IconHelper.ExtractIcon(TargetFilePath, 0);
@ -226,6 +229,7 @@ namespace SystemTrayMenu.DataClasses
else
{
Icon = IconReader.GetFileIconWithCache(browserPath, false);
diposeIcon = false;
handled = true;
}
}
@ -427,7 +431,10 @@ namespace SystemTrayMenu.DataClasses
{
waitMenuOpen.Dispose();
Reading.Dispose();
Icon?.Dispose();
if (diposeIcon)
{
Icon?.Dispose();
}
}
isDisposed = true;
}

10
Utilities/File/IconReader.cs
View file

@ -33,6 +33,14 @@ namespace SystemTrayMenu.Utilities
Closed = 1
}
public static void Dispose()
{
foreach (Icon icon in dictIconCache.Values)
{
icon.Dispose();
}
}
public static Icon GetFileIconWithCache(string filePath, bool linkOverlay,
IconSize size = IconSize.Small)
{
@ -41,7 +49,7 @@ namespace SystemTrayMenu.Utilities
if (IsExtensionWitSameIcon(extension))
{
icon = (Icon)dictIconCache.GetOrAdd(extension, GetIcon).Clone();
icon = dictIconCache.GetOrAdd(extension, GetIcon);
Icon GetIcon(string keyExtension)
{
return GetFileIcon(filePath, linkOverlay, size);