The WORKAREAHEIGHT wasn't calculated correctly. Fixed.

This commit is contained in:
Kimmo Pekkola 2009-08-01 11:46:15 +00:00
parent 4d9262e342
commit 14648a2974
2 changed files with 7 additions and 4 deletions

View File

@ -290,7 +290,7 @@
/> />
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
CommandLine="if not exist ..\testbench\x32\debug\skins (mkdir ..\testbench\x32\debug\skins)&#x0D;&#x0A;xcopy /S /Y ..\Install\Skins ..\testbench\x32\debug\skins&#x0D;&#x0A;" CommandLine="if not exist ..\testbench\x32\debug\skins (mkdir ..\testbench\x32\debug\skins)&#x0D;&#x0A;echo &quot;Copying the skins...&quot;&#x0D;&#x0A;xcopy /Q /S /Y ..\Install\Skins ..\testbench\x32\debug\skins&#x0D;&#x0A;"
/> />
</Configuration> </Configuration>
<Configuration <Configuration
@ -476,7 +476,7 @@
/> />
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
CommandLine="if not exist ..\testbench\x32\release\skins (mkdir ..\testbench\x32\release\skins)&#x0D;&#x0A;xcopy /S /Y ..\Install\Skins ..\testbench\x32\release\skins&#x0D;&#x0A;" CommandLine="if not exist ..\testbench\x32\release\skins (mkdir ..\testbench\x32\release\skins)&#x0D;&#x0A;echo &quot;Copying the skins...&quot;&#x0D;&#x0A;xcopy /Q /S /Y ..\Install\Skins ..\testbench\x32\release\skins&#x0D;&#x0A;"
/> />
</Configuration> </Configuration>
<Configuration <Configuration

View File

@ -71,10 +71,13 @@ void CConfigParser::Initialize(LPCTSTR filename, CRainmeter* pRainmeter)
m_Variables[L"CURRENTPATH"] = CRainmeter::ExtractPath(filename); m_Variables[L"CURRENTPATH"] = CRainmeter::ExtractPath(filename);
m_Variables[L"ADDONSPATH"] = pRainmeter->GetPath() + L"Addons\\"; m_Variables[L"ADDONSPATH"] = pRainmeter->GetPath() + L"Addons\\";
RECT workArea;
SystemParametersInfo(SPI_GETWORKAREA, 0, &workArea, 0);
TCHAR buffer[256]; TCHAR buffer[256];
swprintf(buffer, L"%i", GetSystemMetrics(SM_CXFULLSCREEN)); swprintf(buffer, L"%i", workArea.right - workArea.left);
m_Variables[L"WORKAREAWIDTH"] = buffer; m_Variables[L"WORKAREAWIDTH"] = buffer;
swprintf(buffer, L"%i", GetSystemMetrics(SM_CYFULLSCREEN)); swprintf(buffer, L"%i", workArea.bottom - workArea.top);
m_Variables[L"WORKAREAHEIGHT"] = buffer; m_Variables[L"WORKAREAHEIGHT"] = buffer;
swprintf(buffer, L"%i", GetSystemMetrics(SM_CXSCREEN)); swprintf(buffer, L"%i", GetSystemMetrics(SM_CXSCREEN));
m_Variables[L"SCREENAREAWIDTH"] = buffer; m_Variables[L"SCREENAREAWIDTH"] = buffer;