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

Updated release notes

Browse Source 
Finally a working zoomed out view for the Semantic Zoom
This commit is contained in:
BONNEVILLE Geoffroy
2018-06-06 12:13:25 +02:00
parent 9566c9a719
commit 1334b266b9
4 changed files with 20 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ModernKeePassLib/Utility/UrlUtil.cs
View File

@@ -327,10 +327,10 @@ namespace ModernKeePassLib.Utility
return strTargetFile;
}
#if (!ModernKeePassLib && !KeePassLibSD && !KeePassRT)
#if (!KeePassLibSD && !KeePassUAP && !ModernKeePassLib)
if(NativeLib.IsUnix())
#endif
{
#endif
bool bBaseUnc = IsUncPath(strBaseFile);
bool bTargetUnc = IsUncPath(strTargetFile);
if((!bBaseUnc && bTargetUnc) || (bBaseUnc && !bTargetUnc))
@@ -358,9 +358,9 @@ namespace ModernKeePassLib.Utility
}
return sbRel.ToString();
#if (!KeePassLibSD && !KeePassUAP && !ModernKeePassLib)
}
#if (!ModernKeePassLib && !KeePassLibSD && !KeePassRT)
try // Windows
{
const int nMaxPath = NativeMethods.MAX_PATH * 2;
@@ -453,16 +453,10 @@ namespace ModernKeePassLib.Utility
string str;
try
{
#if KeePassRT
var dirT = Windows.Storage.StorageFolder.GetFolderFromPathAsync(
strPath).AwaitEx();
str = dirT.Path;
#elif ModernKeePassLib
#if ModernKeePassLib
var dirT = StorageFolder.GetFolderFromPathAsync(
strPath).GetResults();
str = dirT.Path;
/*var dirT = FileSystem.Current.GetFolderFromPathAsync(strPath).Result;
str = dirT.Path;*/
#else
str = Path.GetFullPath(strPath);
#endif
@@ -640,8 +634,8 @@ namespace ModernKeePassLib.Utility
string strDir;
if(NativeLib.IsUnix())
strDir = NativeMethods.GetUserRuntimeDir();
#if ModernKeePassLib
else strDir = ApplicationData.Current.TemporaryFolder.Path;
#if KeePassUAP || ModernKeePassLib
else strDir = Windows.Storage.ApplicationData.Current.TemporaryFolder.Path;
#else
else strDir = Path.GetTempPath();