wismna/modernkeepass
1
0
Fork 0
mirror of https://github.com/wismna/ModernKeePass.git synced 2025-10-03 23:50:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

Deactivation of buggy Splat custom icon implementation

Browse Source
This commit is contained in:
BONNEVILLE Geoffroy
2018-03-12 12:40:07 +01:00
parent fb0eab00c2
commit 7613629d87
3 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ModernKeePassLib/PwCustomIcon.cs
View File

@@ -80,11 +80,7 @@ namespace ModernKeePassLib
// MemoryStream ms = new MemoryStream(m_pbImageDataPng, false);
// m_imgOrg = Image.FromStream(ms);
// ms.Close();
#if ModernKeePassLib
try { m_imgOrg = GfxUtil.LoadImage(m_pbImageDataPng).GetAwaiter().GetResult(); }
#else
try { m_imgOrg = GfxUtil.LoadImage(m_pbImageDataPng); }
#endif
catch(Exception) { Debug.Assert(false); m_imgOrg = null; }
if(m_imgOrg != null)
@@ -121,13 +117,14 @@ namespace ModernKeePassLib
Image img;
if(m_dImageCache.TryGetValue(lID, out img)) return img;
#if ModernKeePassLib
img = GfxUtil.ScaleImage(m_pbImageDataPng, w, h).GetAwaiter().GetResult();
img = GfxUtil.ScaleImage(m_pbImageDataPng, w, h);
#else
img = GfxUtil.ScaleImage(m_imgOrg, w, h, ScaleTransformFlags.UIIcon);
#endif
m_dImageCache[lID] = img;
return img;
m_dImageCache[lID] = img;
return img;
}
#endif
}