haeaeae/duplicati
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/fix_windows_icon_sizes

Browse Source 
# Conflicts:
#	Duplicati/GUI/Duplicati.GUI.TrayIcon/ImageLoader.cs

Fixed the imageloader so it actually respects the size
This commit is contained in:
Kenneth Skovhede
2016-03-22 21:12:23 +01:00
parent 46a3d51507 8b6e3dc93e
commit 58042d4b7f
2 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Duplicati/GUI/Duplicati.GUI.TrayIcon/ImageLoader.cs
+9 -14
View File
@@ -21,14 +21,6 @@ using System.Collections.Generic;
namespace Duplicati.GUI.TrayIcon
{
public static class ImageLoaderMac
{
public static Icon LoadFromStream(System.IO.Stream s)
{
return null;
}
}
public static class ImageLoader
{
private static readonly System.Reflection.Assembly ASSEMBLY = System.Reflection.Assembly.GetExecutingAssembly();
@@ -58,7 +50,10 @@ namespace Duplicati.GUI.TrayIcon
public static Icon LoadIcon(string filename, Size size)
{
Icon ico;
if (ICONS.TryGetValue(filename, out ico))
var cachename = string.Format("{0};{1}x{2}", filename, size.Width, size.Height);
if (ICONS.TryGetValue(cachename, out ico))
return ico;
if (!filename.EndsWith(".ico", StringComparison.InvariantCultureIgnoreCase))
@@ -70,15 +65,15 @@ namespace Duplicati.GUI.TrayIcon
ms.Position = 0;
lock(LOCK)
if (!ICONS.TryGetValue(filename, out ico))
return ICONS[filename] = ic;
if (!ICONS.TryGetValue(cachename, out ico))
return ICONS[cachename] = ic;
}
lock(LOCK)
if (!ICONS.TryGetValue(filename, out ico))
return ICONS[filename] = new Icon(ASSEMBLY.GetManifestResourceStream(PREFIX + filename), System.Windows.Forms.SystemInformation.SmallIconSize);
if (!ICONS.TryGetValue(cachename, out ico))
return ICONS[cachename] = new Icon(ASSEMBLY.GetManifestResourceStream(PREFIX + filename), size);
return ICONS[filename];
return ICONS[cachename];
}
public const string NormalIcon = "Resources.TrayNormal.ico";
Duplicati/GUI/Duplicati.GUI.TrayIcon/WinFormsRunner.cs
+2
View File
@@ -116,6 +116,8 @@ namespace Duplicati.GUI.TrayIcon.Windows
WinFormsRunner.Instance = this;
ImageLoader.SetTrayIconSize(System.Windows.Forms.SystemInformation.SmallIconSize);
//We need this ugly hack to get a handle that we can call Invoke on,
// and sadly the TrayIcon does not expose one, and forcing the context menu
// to create one causes weird "lost clicks"