Minor change for r600.

This commit is contained in:
spx 2010-11-13 19:53:28 +00:00
parent 35d0eeea11
commit b9c406aef2

View File

@ -52,7 +52,7 @@ CMeter::CMeter(CMeterWindow* meterWindow) : m_MeterWindow(meterWindow)
m_SolidBevel = BEVELTYPE_NONE; m_SolidBevel = BEVELTYPE_NONE;
m_MouseOver = false; m_MouseOver = false;
m_UpdateDivider = 1; m_UpdateDivider = 1;
m_UpdateCounter = 0; m_UpdateCounter = 1;
m_RelativeX = POSITION_ABSOLUTE; m_RelativeX = POSITION_ABSOLUTE;
m_RelativeY = POSITION_ABSOLUTE; m_RelativeY = POSITION_ABSOLUTE;
m_SolidAngle = 0.0f; m_SolidAngle = 0.0f;
@ -276,8 +276,6 @@ void CMeter::ReadConfig(const WCHAR* section)
parser.SetStyleTemplate(style); parser.SetStyleTemplate(style);
} }
UINT oldUpdateDivider = m_UpdateDivider;
std::wstring oldStyleX = m_StyleX; std::wstring oldStyleX = m_StyleX;
std::wstring oldStyleY = m_StyleY; std::wstring oldStyleY = m_StyleY;
std::wstring oldStyleHidden = m_StyleHidden; std::wstring oldStyleHidden = m_StyleHidden;
@ -411,7 +409,12 @@ void CMeter::ReadConfig(const WCHAR* section)
m_MeasureName = parser.ReadString(section, L"MeasureName", L""); m_MeasureName = parser.ReadString(section, L"MeasureName", L"");
m_UpdateDivider = parser.ReadInt(section, L"UpdateDivider", 1); UINT updateDivider = parser.ReadInt(section, L"UpdateDivider", 1);
if (updateDivider != m_UpdateDivider)
{
m_UpdateCounter = m_UpdateDivider = updateDivider;
}
m_AntiAlias = 0!=parser.ReadInt(section, L"AntiAlias", 0); m_AntiAlias = 0!=parser.ReadInt(section, L"AntiAlias", 0);
m_DynamicVariables = 0!=parser.ReadInt(section, L"DynamicVariables", 0); m_DynamicVariables = 0!=parser.ReadInt(section, L"DynamicVariables", 0);
@ -428,12 +431,6 @@ void CMeter::ReadConfig(const WCHAR* section)
std::wstring group = parser.ReadString(section, L"Group", L""); std::wstring group = parser.ReadString(section, L"Group", L"");
InitializeGroup(group); InitializeGroup(group);
if (!m_Initialized ||
oldUpdateDivider != m_UpdateDivider)
{
m_UpdateCounter = m_UpdateDivider;
}
/* Are these necessary? /* Are these necessary?
if (m_W == 0 || m_H == 0) if (m_W == 0 || m_H == 0)
{ {