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

ClipString options changed back to 0/1, and Auto changed to 2 to be more consistent with other options and to allow formulas.

Browse Source
This commit is contained in:
Brian Ferguson 2013-01-25 21:05:47 -07:00
parent cef10fee4d
commit 178ccb0af4
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Library/MeterString.cpp
View File

@ -349,24 +349,25 @@ void CMeterString::ReadOptions(CConfigParser& parser, const WCHAR* section)
m_Percentual = 0!=parser.ReadInt(section, L"Percentual", 0); m_Percentual = 0!=parser.ReadInt(section, L"Percentual", 0);
const WCHAR* clipping = parser.ReadString(section, L"ClipString", L"OFF").c_str(); int clipping = parser.ReadInt(section, L"ClipString", 0);
if (_wcsicmp(clipping, L"OFF") == 0 || _wcsicmp(clipping, L"0") == 0) switch (clipping)
{
m_ClipType = CLIP_OFF;
}
else if (_wcsicmp(clipping, L"ON") == 0 || _wcsicmp(clipping, L"1") == 0)
{
m_ClipType = CLIP_ON;
}
else if (_wcsicmp(clipping, L"AUTO") == 0)
{ {
case 2:
m_ClipType = CLIP_AUTO; m_ClipType = CLIP_AUTO;
m_ClipStringW = parser.ReadInt(section, L"ClipStringW", -1); m_ClipStringW = parser.ReadInt(section, L"ClipStringW", -1);
m_ClipStringH = parser.ReadInt(section, L"ClipStringH", -1); m_ClipStringH = parser.ReadInt(section, L"ClipStringH", -1);
} break;
else
{ case 1:
m_ClipType = CLIP_ON;
break;
case 0:
m_ClipType = CLIP_OFF;
break;
default:
LogWithArgs(LOG_ERROR, L"ClipString=%s is not valid in [%s]", clipping, m_Name.c_str()); LogWithArgs(LOG_ERROR, L"ClipString=%s is not valid in [%s]", clipping, m_Name.c_str());
} }