From 6b06548260874ab3bc8fb6ec04f4e46b6dd684b5 Mon Sep 17 00:00:00 2001
From: spx <spx268@gmail.com>
Date: Thu, 8 Sep 2011 04:35:04 +0000
Subject: [PATCH] Code cleanup.

---
 Library/MeterButton.cpp |  4 ++--
 Library/MeterWindow.cpp | 14 +++++++-------
 Library/TrayWindow.cpp  |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Library/MeterButton.cpp b/Library/MeterButton.cpp
index d61a5935..450fd05c 100644
--- a/Library/MeterButton.cpp
+++ b/Library/MeterButton.cpp
@@ -313,8 +313,8 @@ bool CMeterButton::MouseMove(POINT pos)
 		}
 		else
 		{
-			// If the left button is not down anymore the cliked state needs to be set false
-			if ((GetKeyState(VK_LBUTTON) & 0x8000) == 0)
+			// If the left button is not down anymore the clicked state needs to be set false
+			if (!(GetKeyState(VK_LBUTTON) < 0))
 			{
 				m_Clicked = false;
 			}
diff --git a/Library/MeterWindow.cpp b/Library/MeterWindow.cpp
index 88e5b26e..e30cccc7 100644
--- a/Library/MeterWindow.cpp
+++ b/Library/MeterWindow.cpp
@@ -3196,7 +3196,7 @@ LRESULT CMeterWindow::OnTimer(UINT uMsg, WPARAM wParam, LPARAM lParam)
 				}
 				else
 				{
-					bool keyDown = GetKeyState(VK_CONTROL) & 0x8000 || GetKeyState(VK_SHIFT) & 0x8000 || GetKeyState(VK_MENU) & 0x8000;
+					bool keyDown = GetKeyState(VK_CONTROL) < 0 || GetKeyState(VK_SHIFT) < 0 || GetKeyState(VK_MENU) < 0;
 
 					if (!keyDown || GetWindowFromPoint(pos) != m_Window)
 					{
@@ -3306,7 +3306,7 @@ void CMeterWindow::FadeWindow(int from, int to)
 */
 void CMeterWindow::ShowWindowIfAppropriate()
 {
-	bool keyDown = GetKeyState(VK_CONTROL) & 0x8000 || GetKeyState(VK_SHIFT) & 0x8000 || GetKeyState(VK_MENU) & 0x8000;
+	bool keyDown = GetKeyState(VK_CONTROL) < 0 || GetKeyState(VK_SHIFT) < 0 || GetKeyState(VK_MENU) < 0;
 
 	POINT pos;
 	GetCursorPos(&pos);
@@ -3530,7 +3530,7 @@ LRESULT CMeterWindow::OnEnterMenuLoop(UINT uMsg, WPARAM wParam, LPARAM lParam)
 */
 LRESULT CMeterWindow::OnMouseMove(UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
-	bool keyDown = GetKeyState(VK_CONTROL) & 0x8000 || GetKeyState(VK_SHIFT) & 0x8000 || GetKeyState(VK_MENU) & 0x8000;
+	bool keyDown = GetKeyState(VK_CONTROL) < 0 || GetKeyState(VK_SHIFT) < 0 || GetKeyState(VK_MENU) < 0;
 
 	if (!keyDown)
 	{
@@ -4080,7 +4080,7 @@ LRESULT CMeterWindow::OnWindowPosChanging(UINT uMsg, WPARAM wParam, LPARAM lPara
 
 	if ((wp->flags & SWP_NOMOVE) == 0)
 	{
-		if (m_SnapEdges && !(GetKeyState(VK_CONTROL) & 0x8000 || GetKeyState(VK_SHIFT) & 0x8000))
+		if (m_SnapEdges && !(GetKeyState(VK_CONTROL) < 0 || GetKeyState(VK_SHIFT) < 0))
 		{
 			// only process movement (ignore anything without winpos values)
 			if (wp->cx != 0 && wp->cy != 0)
@@ -4289,7 +4289,7 @@ LRESULT CMeterWindow::OnLeftButtonDown(UINT uMsg, WPARAM wParam, LPARAM lParam)
 	// Handle buttons
 	HandleButtons(pos, BUTTONPROC_DOWN, NULL);
 
-	if ((GetKeyState(VK_CONTROL) & 0x80) ||  // Ctrl is pressed, so only run default action
+	if (GetKeyState(VK_CONTROL) < 0 ||  // Ctrl is pressed, so only run default action
 		(!DoAction(pos.x, pos.y, MOUSE_LMB_DOWN, false) && m_WindowDraggable))
 	{
 		// Cancel the mouse event beforehand
@@ -4398,7 +4398,7 @@ LRESULT CMeterWindow::OnRightButtonUp(UINT uMsg, WPARAM wParam, LPARAM lParam)
 	// Handle buttons
 	HandleButtons(pos, BUTTONPROC_MOVE, NULL);
 
-	if ((GetKeyState(VK_CONTROL) & 0x80) ||  // Ctrl is pressed, so only run default action
+	if (GetKeyState(VK_CONTROL) < 0 ||  // Ctrl is pressed, so only run default action
 		!DoAction(pos.x, pos.y, MOUSE_RMB_UP, false))
 	{
 		// Run the DefWindowProc so the context menu works
@@ -4548,7 +4548,7 @@ LRESULT CMeterWindow::OnContextMenu(UINT uMsg, WPARAM wParam, LPARAM lParam)
 		HandleButtons(posc, BUTTONPROC_MOVE, NULL);
 
 		// If RMB up or RMB down or double-click cause actions, do not show the menu!
-		if ((GetKeyState(VK_CONTROL) & 0x80) == 0 &&  // Ctrl is pressed, so ignore any actions
+		if (!(GetKeyState(VK_CONTROL) < 0) &&  // Ctrl is pressed, so ignore any actions
 			(DoAction(posc.x, posc.y, MOUSE_RMB_UP, false) || DoAction(posc.x, posc.y, MOUSE_RMB_DOWN, true) || DoAction(posc.x, posc.y, MOUSE_RMB_DBLCLK, true)))
 		{
 			return 0;
diff --git a/Library/TrayWindow.cpp b/Library/TrayWindow.cpp
index 15f26dce..843afcf4 100644
--- a/Library/TrayWindow.cpp
+++ b/Library/TrayWindow.cpp
@@ -581,7 +581,7 @@ LRESULT CALLBACK CTrayWindow::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
 				break;
 			}
 
-			if (!(GetKeyState(VK_CONTROL) & 0x80) &&   // Ctrl is pressed, so only run default action
+			if (!(GetKeyState(VK_CONTROL) < 0) &&   // Ctrl is pressed, so only run default action
 				!bang.empty())
 			{
 				Rainmeter->ExecuteCommand(bang.c_str(), NULL);