- Added BackgroundMode=4 for tiling background image.

- Added tinting functions for Background.
- Added "ImageCrop" option to Meter=IMAGE/BAR/HISTOGRAM/ROTATOR and Background.
- Added "Tile" option to Meter=IMAGE.
- Some code cleanups.
This commit is contained in:
spx
2010-12-04 15:07:28 +00:00
parent 19294c4339
commit 96c81ac516
13 changed files with 395 additions and 200 deletions

View File

@ -244,8 +244,6 @@ void CMeterString::Initialize()
*/
void CMeterString::ReadConfig(const WCHAR* section)
{
WCHAR tmpName[64];
// Store the current font values so we know if the font needs to be updated
std::wstring oldFontFace = m_FontFace;
int oldFontSize = m_FontSize;
@ -256,11 +254,10 @@ void CMeterString::ReadConfig(const WCHAR* section)
CConfigParser& parser = m_MeterWindow->GetParser();
m_MeasureNames.clear();
// Check for extra measures
if (!m_MeasureName.empty())
if (!m_Initialized && !m_MeasureName.empty())
{
WCHAR tmpName[64];
int i = 2;
bool loop = true;
do
@ -415,7 +412,7 @@ void CMeterString::ReadConfig(const WCHAR* section)
throw CError(error, __LINE__, __FILE__);
}
if (-1 != (int)parser.ReadFormula(section, L"W", -1) && -1 != (int)parser.ReadFormula(section, L"H", -1))
if (parser.IsValueDefined(section, L"W") && parser.IsValueDefined(section, L"H"))
{
m_DimensionsDefined = true;
}