From 14648a29745208814d4bc7a886d11ab8a77e784a Mon Sep 17 00:00:00 2001
From: Kimmo Pekkola <kimmo.pekkola@gmail.com>
Date: Sat, 1 Aug 2009 11:46:15 +0000
Subject: [PATCH] The WORKAREAHEIGHT wasn't calculated correctly. Fixed.

---
 Application/Application.vcproj | 4 ++--
 Library/ConfigParser.cpp       | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Application/Application.vcproj b/Application/Application.vcproj
index 4ea2c874..0b042fe1 100644
--- a/Application/Application.vcproj
+++ b/Application/Application.vcproj
@@ -290,7 +290,7 @@
 			/>
 			<Tool
 				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
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				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
diff --git a/Library/ConfigParser.cpp b/Library/ConfigParser.cpp
index 3f420e22..b19e374f 100644
--- a/Library/ConfigParser.cpp
+++ b/Library/ConfigParser.cpp
@@ -71,10 +71,13 @@ void CConfigParser::Initialize(LPCTSTR filename, CRainmeter* pRainmeter)
 		m_Variables[L"CURRENTPATH"] = CRainmeter::ExtractPath(filename);
 		m_Variables[L"ADDONSPATH"] = pRainmeter->GetPath() + L"Addons\\";
 
+		RECT workArea;
+		SystemParametersInfo(SPI_GETWORKAREA, 0, &workArea, 0);
+
 		TCHAR buffer[256];
-		swprintf(buffer, L"%i", GetSystemMetrics(SM_CXFULLSCREEN));
+		swprintf(buffer, L"%i", workArea.right - workArea.left);
 		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;
 		swprintf(buffer, L"%i", GetSystemMetrics(SM_CXSCREEN));
 		m_Variables[L"SCREENAREAWIDTH"] = buffer;