chibicitiberiu/rainmeter-studio
1
0
Fork 0
mirror of https://github.com/chibicitiberiu/rainmeter-studio.git synced 2024-02-24 04:33:31 +00:00
Code Issues Releases Wiki Activity

Code cleanup.

Browse Source
This commit is contained in:
spx 2011-09-08 04:35:04 +00:00
parent 782fb0fba6
commit 6b06548260
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/MeterButton.cpp
View File

@ -313,8 +313,8 @@ bool CMeterButton::MouseMove(POINT pos)
} }
else else
{ {
// If the left button is not down anymore the cliked state needs to be set false // If the left button is not down anymore the clicked state needs to be set false
if ((GetKeyState(VK_LBUTTON) & 0x8000) == 0) if (!(GetKeyState(VK_LBUTTON) < 0))
{ {
m_Clicked = false; m_Clicked = false;
} }

14
Library/MeterWindow.cpp
View File

@ -3196,7 +3196,7 @@ LRESULT CMeterWindow::OnTimer(UINT uMsg, WPARAM wParam, LPARAM lParam)
} }
else 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) if (!keyDown || GetWindowFromPoint(pos) != m_Window)
{ {
@ -3306,7 +3306,7 @@ void CMeterWindow::FadeWindow(int from, int to)
*/ */
void CMeterWindow::ShowWindowIfAppropriate() 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; POINT pos;
GetCursorPos(&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) 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) if (!keyDown)
{ {
@ -4080,7 +4080,7 @@ LRESULT CMeterWindow::OnWindowPosChanging(UINT uMsg, WPARAM wParam, LPARAM lPara
if ((wp->flags & SWP_NOMOVE) == 0) 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) // only process movement (ignore anything without winpos values)
if (wp->cx != 0 && wp->cy != 0) if (wp->cx != 0 && wp->cy != 0)
@ -4289,7 +4289,7 @@ LRESULT CMeterWindow::OnLeftButtonDown(UINT uMsg, WPARAM wParam, LPARAM lParam)
// Handle buttons // Handle buttons
HandleButtons(pos, BUTTONPROC_DOWN, NULL); 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)) (!DoAction(pos.x, pos.y, MOUSE_LMB_DOWN, false) && m_WindowDraggable))
{ {
// Cancel the mouse event beforehand // Cancel the mouse event beforehand
@ -4398,7 +4398,7 @@ LRESULT CMeterWindow::OnRightButtonUp(UINT uMsg, WPARAM wParam, LPARAM lParam)
// Handle buttons // Handle buttons
HandleButtons(pos, BUTTONPROC_MOVE, NULL); 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)) !DoAction(pos.x, pos.y, MOUSE_RMB_UP, false))
{ {
// Run the DefWindowProc so the context menu works // 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); HandleButtons(posc, BUTTONPROC_MOVE, NULL);
// If RMB up or RMB down or double-click cause actions, do not show the menu! // 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))) (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; return 0;

2
Library/TrayWindow.cpp
View File

@ -581,7 +581,7 @@ LRESULT CALLBACK CTrayWindow::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
break; 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()) !bang.empty())
{ {
Rainmeter->ExecuteCommand(bang.c_str(), NULL); Rainmeter->ExecuteCommand(bang.c_str(), NULL);