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

Refactor skin scanning and skin folder indexing into SkinRegistry.cpp

Browse Source 
This also adds tests.
This commit is contained in:
Birunthan Mohanathas
2013-06-16 19:14:59 +03:00
parent 6332702f75
commit 5c91ab365d
20 changed files with 565 additions and 310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Library/CommandHandler.cpp
View File

@ -577,26 +577,11 @@ void CommandHandler::DoActivateSkinBang(std::vector<std::wstring>& args, MeterWi
{
if (args.size() == 1)
{
int index = GetRainmeter().FindSkinFolderIndex(args[0]);
if (index != -1)
{
const Rainmeter::SkinFolder& skinFolder = GetRainmeter().m_SkinFolders[index];
if (!(skinFolder.active == 1 && skinFolder.files.size() == 1))
{
// Activate the next index.
GetRainmeter().ActivateSkin(index, (skinFolder.active < skinFolder.files.size()) ? skinFolder.active : 0);
}
return;
}
if (GetRainmeter().ActivateSkin(args[0])) return;
}
else if (args.size() > 1)
{
std::pair<int, int> indexes = GetRainmeter().GetMeterWindowIndex(args[0], args[1]);
if (indexes.first != -1 && indexes.second != -1)
{
GetRainmeter().ActivateSkin(indexes.first, indexes.second);
return;
}
if (GetRainmeter().ActivateSkin(args[0], args[1])) return;
}
LogError(L"!ActivateConfig: Invalid parameters");