From 70ae84faca96c42609abfcb1c00830078be5e5f1 Mon Sep 17 00:00:00 2001
From: jsmorley <jsmorley@gmail.com>
Date: Tue, 11 May 2010 17:09:39 +0000
Subject: [PATCH] Changed the default for "AlwaysOnTop" (ZPos) from "Normal"
 (0) to "On Desktop" (-2) now that On Desktop is working right with Vista /
 Win7.

Some minor changes to images for RainBackup and RainThemes. Using new background pattern from poiru.
---
 Library/MeterWindow.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/Library/MeterWindow.cpp b/Library/MeterWindow.cpp
index e0c3ca0c..f098054d 100644
--- a/Library/MeterWindow.cpp
+++ b/Library/MeterWindow.cpp
@@ -88,7 +88,7 @@ CMeterWindow::CMeterWindow(std::wstring& path, std::wstring& config, std::wstrin
 	m_AnchorYPercentage = false;
 	m_AnchorScreenX = 0; 
 	m_AnchorScreenY = 0;
-	m_WindowZPosition = ZPOSITION_NORMAL;
+	m_WindowZPosition = ZPOSITION_ONDESKTOP;
 	m_WindowDraggable = true;
 	m_WindowUpdate = 1000;
 	m_TransitionUpdate = 100;
@@ -1409,7 +1409,8 @@ void CMeterWindow::ReadConfig()
 			swprintf(buffer, L"%i", (int)value);
 			m_WindowY = buffer;
 		}
-
+		
+		// Changed to make the default "On Desktop" - JSMorley : May 11, 2010
 		int zPos = parser.ReadInt(section, L"AlwaysOnTop", m_WindowZPosition);
 		if (zPos == -1)
 		{
@@ -1419,6 +1420,10 @@ void CMeterWindow::ReadConfig()
 		{
 			m_WindowZPosition = ZPOSITION_ONDESKTOP;
 		}
+		else if (zPos == 0)
+		{
+			m_WindowZPosition = ZPOSITION_NORMAL;
+		}		
 		else if (zPos == 1)
 		{
 			m_WindowZPosition = ZPOSITION_ONTOP;
@@ -1429,7 +1434,7 @@ void CMeterWindow::ReadConfig()
 		}
 		else
 		{
-			m_WindowZPosition = ZPOSITION_NORMAL;
+			m_WindowZPosition = ZPOSITION_ONDESKTOP;
 		}
 
 		m_WindowDraggable = 0!=parser.ReadInt(section, L"Draggable", m_WindowDraggable);