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

Additional change to f2a494b

Browse Source
This commit is contained in:
Birunthan Mohanathas 2012-06-03 12:56:33 +03:00
parent f2a494b675
commit 1fece1e4d8
2 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
Library/Measure.cpp
View File

@ -543,32 +543,27 @@ bool CMeasure::Update()
{ {
// Disabled measures have 0 as value // Disabled measures have 0 as value
m_Value = 0.0; m_Value = 0.0;
// Set IfAction committed state to false if condition is not met with value = 0
if ((int)m_IfEqualValue != 0)
{
m_IfEqualCommitted = false;
}
if (m_IfAboveValue <= 0.0)
{
m_IfAboveCommitted = false;
}
if (m_IfBelowValue >= 0.0)
{
m_IfBelowCommitted = false;
}
return false; return false;
} }
} }
void CMeasure::Disable()
{
m_Disabled = true;
// IfActions are not checked when disabled, so set committed state to false if
// condition is not met with value = 0
if ((int)m_IfEqualValue != 0)
{
m_IfEqualCommitted = false;
}
if (m_IfAboveValue <= 0.0)
{
m_IfAboveCommitted = false;
}
if (m_IfBelowValue >= 0.0)
{
m_IfBelowCommitted = false;
}
}
/* /*
** Returns the value of the measure. ** Returns the value of the measure.
** **

2
Library/Measure.h
View File

@ -57,7 +57,7 @@ public:
const WCHAR* GetName() { return m_Name.c_str(); } const WCHAR* GetName() { return m_Name.c_str(); }
const std::wstring& GetOriginalName() { return m_Name; } const std::wstring& GetOriginalName() { return m_Name; }
void Disable(); void Disable() { m_Disabled = true; }
void Enable() { m_Disabled = false; } void Enable() { m_Disabled = false; }
bool IsDisabled() { return m_Disabled; } bool IsDisabled() { return m_Disabled; }