chibicitiberiu/rainmeter-studio
1
0
Fork 0
mirror of https://github.com/chibicitiberiu/rainmeter-studio.git synced 2024-02-24 04:33:31 +00:00
Code Issues Releases Wiki Activity

Minor tweaks and cosmetics.

Browse Source
This commit is contained in:
spx
2011-07-18 00:32:09 +00:00
parent a639eb7cc1
commit 15eba97cba
7 changed files with 37 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
Library/MeterWindow.cpp
View File

@ -5072,17 +5072,41 @@ void CMeterWindow::SetWindowSizeVariables(int w, int h)
*/
std::wstring CMeterWindow::MakePathAbsolute(const std::wstring& path)
{
std::wstring absolute;
if (path.empty() ||
path.find(L":\\") != std::wstring::npos || path.find(L":/") != std::wstring::npos ||
(path.length() >= 2 && (path[0] == L'\\' || path[0] == L'/') && (path[1] == L'\\' || path[1] == L'/'))) // UNC
{
return path; // It's already absolute path (or it's empty)
absolute = path; // It's already absolute path (or it's empty)
}
else
{
absolute = m_SkinPath;
absolute += m_SkinName;
absolute += L"\\";
absolute += path;
}
std::wstring root = m_SkinPath + m_SkinName;
root += L"\\";
return absolute;
}
return root + path;
std::wstring CMeterWindow::GetSkinRootPath()
{
std::wstring path = m_Rainmeter->GetSkinPath();
std::wstring::size_type loc;
if ((loc = m_SkinName.find_first_of(L'\\')) != std::wstring::npos)
{
path.append(m_SkinName, 0, loc + 1);
}
else
{
path += m_SkinName;
path += L"\\";
}
return path;
}
@ -5096,7 +5120,6 @@ CMeter* CMeterWindow::GetMeter(const std::wstring& meterName)
return (*j);
}
}
return NULL;
}