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

[Feature] Option to cache main menu (#232, #241), version 1.0.27.5

Browse source
This commit is contained in:
Markus Hofknecht 2021-11-18 21:12:03 +01:00
parent 69e8cf4e6b
commit c647cfef86
6 changed files with 63 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Business/Menus.cs
View file

@ -443,7 +443,7 @@ namespace SystemTrayMenu.Business
rowData.ContainsMenu = true;
rowData.HiddenEntry = hiddenEntry;
string resolvedLnkPath = string.Empty;
rowData.ReadIcon(true, ref resolvedLnkPath);
rowData.ReadIcon(true, ref resolvedLnkPath, level);
rowData.MenuLevel = level;
menuData.RowDatas.Add(rowData);
}
@ -495,7 +495,7 @@ namespace SystemTrayMenu.Business
RowData rowData = ReadRowData(file, false);
string resolvedLnkPath = string.Empty;
if (rowData.ReadIcon(false, ref resolvedLnkPath))
if (rowData.ReadIcon(false, ref resolvedLnkPath, level))
{
rowData = ReadRowData(resolvedLnkPath, true, rowData);
rowData.ContainsMenu = true;
@ -918,7 +918,11 @@ namespace SystemTrayMenu.Business
if (IconReader.ClearIfCacheTooBig())
{
GC.Collect();
MainPreload();
if (!Properties.Settings.Default.CacheMainMenu)
{
MainPreload();
}
}
openCloseState = OpenCloseState.Default;

28
DataClasses/RowData.cs
View file

@ -86,7 +86,7 @@ namespace SystemTrayMenu.DataClasses
row[2] = data;
}
internal bool ReadIcon(bool isDirectory, ref string resolvedLnkPath)
internal bool ReadIcon(bool isDirectory, ref string resolvedLnkPath, int level)
{
bool isLnkDirectory = false;
@ -96,7 +96,7 @@ namespace SystemTrayMenu.DataClasses
}
else if (isDirectory)
{
icon = IconReader.GetFolderIconWithCache(TargetFilePathOrig, IconReader.FolderType.Closed, false, true, MenuLevel == 0, out bool loading);
icon = IconReader.GetFolderIconWithCache(TargetFilePathOrig, IconReader.FolderType.Closed, false, true, level == 0, out bool loading);
IconLoading = loading;
}
else
@ -107,19 +107,17 @@ namespace SystemTrayMenu.DataClasses
if (fileExtension == ".lnk")
{
handled = SetLnk(
ref isLnkDirectory,
ref resolvedLnkPath);
handled = SetLnk(level, ref isLnkDirectory, ref resolvedLnkPath);
showOverlay = true;
}
else if (fileExtension == ".url")
{
handled = SetUrl();
handled = SetUrl(level);
showOverlay = true;
}
else if (fileExtension == ".sln")
{
handled = SetSln();
handled = SetSln(level);
}
else if (fileExtension == ".appref-ms")
{
@ -131,7 +129,7 @@ namespace SystemTrayMenu.DataClasses
try
{
FilePathIcon = TargetFilePathOrig;
icon = IconReader.GetFileIconWithCache(FilePathIcon, showOverlay, true, MenuLevel == 0, out bool loading);
icon = IconReader.GetFileIconWithCache(FilePathIcon, showOverlay, true, level == 0, out bool loading);
IconLoading = loading;
}
catch (Exception ex)
@ -256,7 +254,7 @@ namespace SystemTrayMenu.DataClasses
}
}
private bool SetLnk(ref bool isLnkDirectory, ref string resolvedLnkPath)
private bool SetLnk(int level, ref bool isLnkDirectory, ref string resolvedLnkPath)
{
bool handled = false;
resolvedLnkPath = FileLnk.GetResolvedFileName(TargetFilePath);
@ -267,7 +265,7 @@ namespace SystemTrayMenu.DataClasses
}
else if (string.IsNullOrEmpty(Path.GetExtension(resolvedLnkPath)))
{
icon = IconReader.GetFolderIconWithCache(TargetFilePathOrig, IconReader.FolderType.Open, true, true, MenuLevel == 0, out bool loading);
icon = IconReader.GetFolderIconWithCache(TargetFilePathOrig, IconReader.FolderType.Open, true, true, level == 0, out bool loading);
IconLoading = loading;
handled = true;
isLnkDirectory = true;
@ -290,7 +288,7 @@ namespace SystemTrayMenu.DataClasses
return handled;
}
private bool SetUrl()
private bool SetUrl(int level)
{
bool handled = false;
string iconFile = string.Empty;
@ -303,7 +301,7 @@ namespace SystemTrayMenu.DataClasses
if (FileUrl.GetDefaultBrowserPath(out string browserPath))
{
FilePathIcon = browserPath;
icon = IconReader.GetFileIconWithCache(FilePathIcon, true, true, MenuLevel == 0, out bool loading);
icon = IconReader.GetFileIconWithCache(FilePathIcon, true, true, level == 0, out bool loading);
IconLoading = loading;
handled = true;
}
@ -311,7 +309,7 @@ namespace SystemTrayMenu.DataClasses
else if (File.Exists(iconFile))
{
FilePathIcon = iconFile;
icon = IconReader.GetFileIconWithCache(FilePathIcon, true, true, MenuLevel == 0, out bool loading);
icon = IconReader.GetFileIconWithCache(FilePathIcon, true, true, level == 0, out bool loading);
IconLoading = loading;
handled = true;
}
@ -330,12 +328,12 @@ namespace SystemTrayMenu.DataClasses
return handled;
}
private bool SetSln()
private bool SetSln(int level)
{
bool handled = false;
try
{
icon = IconReader.GetExtractAllIconsLastWithCache(TargetFilePathOrig, true, MenuLevel == 0, out bool loading);
icon = IconReader.GetExtractAllIconsLastWithCache(TargetFilePathOrig, true, level == 0, out bool loading);
IconLoading = loading;
handled = true;
}

15
NativeDllImport/CreateRoundRectRgn.cs
View file

@ -12,9 +12,20 @@ namespace SystemTrayMenu.DllImports
/// </summary>
public static partial class NativeMethods
{
public static IntPtr CreateRoundCorners(int width, int height, int widthEllipse, int heightEllipse)
public static bool GetRegionRoundCorners(int width, int height, int widthEllipse, int heightEllipse, out System.Drawing.Region region)
{
return CreateRoundRectRgn(0, 0, width, height, widthEllipse, heightEllipse);
bool success = false;
region = null;
IntPtr handle = CreateRoundRectRgn(0, 0, width, height, widthEllipse, heightEllipse);
if (handle != IntPtr.Zero)
{
region = System.Drawing.Region.FromHrgn(handle);
DeleteObject(handle);
success = true;
}
return success;
}
[DllImport("Gdi32.dll", EntryPoint = "CreateRoundRectRgn", SetLastError = true, CharSet = CharSet.Unicode)]

19
NativeDllImport/DeleteObject.cs Normal file
View file

@ -0,0 +1,19 @@
// <copyright file="DeleteObject.cs" company="PlaceholderCompany">
// Copyright (c) PlaceholderCompany. All rights reserved.
// </copyright>
namespace SystemTrayMenu.DllImports
{
using System;
using System.Runtime.InteropServices;
/// <summary>
/// wraps the methodcalls to native windows dll's.
/// </summary>
public static partial class NativeMethods
{
[DllImport("gdi32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
[DefaultDllImportSearchPaths(DllImportSearchPath.UserDirectories)]
private static extern int DeleteObject(IntPtr hIcon);
}
}

4
Properties/AssemblyInfo.cs
View file

@ -39,5 +39,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.27.3")]
[assembly: AssemblyFileVersion("1.0.27.3")]
[assembly: AssemblyVersion("1.0.27.5")]
[assembly: AssemblyFileVersion("1.0.27.5")]

11
UserInterface/Menu.cs
View file

@ -482,8 +482,15 @@ namespace SystemTrayMenu.UserInterface
if (Properties.Settings.Default.RoundCorners)
{
Region = Region.FromHrgn(NativeMethods.CreateRoundCorners(Width + 1, Height + 1, 15, 15));
tableLayoutPanelMenu.Region = Region.FromHrgn(NativeMethods.CreateRoundCorners(Width - 1, Height - 1, 15, 15));
if (NativeMethods.GetRegionRoundCorners(Width + 1, Height + 1, 15, 15, out Region regionOutline))
{
Region = regionOutline;
}
if (NativeMethods.GetRegionRoundCorners(Width - 1, Height - 1, 15, 15, out Region region))
{
tableLayoutPanelMenu.Region = region;
}
}
}