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

NumOfDecimals is now enabled when Percentual=1 in STRING meter.

Browse Source
This commit is contained in:
spx
2010-09-15 12:52:40 +00:00
parent 6fe8fd0aa7
commit 5ab0192d41
2 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Library/Measure.cpp
View File

@ -510,7 +510,17 @@ const WCHAR* CMeasure::GetStringValue(bool autoScale, double scale, int decimals
if(percentual)
{
swprintf(buffer, L"%i", (UINT)(100.0 * GetRelativeValue()));
double val = 100.0 * GetRelativeValue();
if (decimals == 0)
{
swprintf(buffer, L"%i", (UINT)val);
}
else
{
swprintf(format, L"%%.%if", decimals);
swprintf(buffer, format, val);
}
}
else if(autoScale)
{
@ -518,15 +528,16 @@ const WCHAR* CMeasure::GetStringValue(bool autoScale, double scale, int decimals
}
else
{
double val = GetValue() * (1.0 / scale);
if(decimals == 0)
{
double val = GetValue() * (1.0 / scale);
val += (val >= 0) ? 0.5 : -0.5;
swprintf(buffer, L"%lli", (LONGLONG)val);
}
else if (decimals == -1)
{
swprintf(buffer, L"%.5f", GetValue() * (1.0 / scale));
swprintf(buffer, L"%.5f", val);
size_t len = wcslen(buffer);
if (len >= 6 && wcscmp(buffer + len - 6, L".00000") == 0)
@ -537,7 +548,7 @@ const WCHAR* CMeasure::GetStringValue(bool autoScale, double scale, int decimals
else
{
swprintf(format, L"%%.%if", decimals);
swprintf(buffer, format, GetValue() * (1.0 / scale));
swprintf(buffer, format, val);
}
}