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

Tweaks and fixes

Browse Source
This commit is contained in:
Birunthan Mohanathas 2012-11-23 22:12:02 +02:00
parent 12d7436d11
commit a86b081906
1 changed files with 19 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
Library/MeterWindow.cpp
View File

@ -3233,7 +3233,14 @@ LRESULT CMeterWindow::OnMouseLeave(UINT uMsg, WPARAM wParam, LPARAM lParam)
*/ */
LRESULT CMeterWindow::OnMouseScrollMove(UINT uMsg, WPARAM wParam, LPARAM lParam) LRESULT CMeterWindow::OnMouseScrollMove(UINT uMsg, WPARAM wParam, LPARAM lParam)
{ {
int delta = GET_WHEEL_DELTA_WPARAM(wParam); if (uMsg == WM_MOUSEWHEEL) // If sent through WM_INPUT, uMsg is WM_INPUT.
{
// Fix for Notepad++, which sends WM_MOUSEWHEEL to unfocused windows.
if (m_Window != GetFocus())
{
return 0;
}
}
POINT pos; POINT pos;
pos.x = GET_X_LPARAM(lParam); pos.x = GET_X_LPARAM(lParam);
@ -3244,14 +3251,8 @@ LRESULT CMeterWindow::OnMouseScrollMove(UINT uMsg, WPARAM wParam, LPARAM lParam)
// Handle buttons // Handle buttons
HandleButtons(pos, BUTTONPROC_MOVE); HandleButtons(pos, BUTTONPROC_MOVE);
if (delta < 0) const int delta = GET_WHEEL_DELTA_WPARAM(wParam);
{ DoAction(pos.x, pos.y, (delta < 0) ? MOUSE_MW_DOWN : MOUSE_MW_UP, false);
DoAction(pos.x, pos.y, MOUSE_MW_DOWN, false);
}
else
{
DoAction(pos.x, pos.y, MOUSE_MW_UP, false);
}
return 0; return 0;
} }
@ -3262,8 +3263,6 @@ LRESULT CMeterWindow::OnMouseScrollMove(UINT uMsg, WPARAM wParam, LPARAM lParam)
*/ */
LRESULT CMeterWindow::OnMouseHScrollMove(UINT uMsg, WPARAM wParam, LPARAM lParam) LRESULT CMeterWindow::OnMouseHScrollMove(UINT uMsg, WPARAM wParam, LPARAM lParam)
{ {
int delta = GET_WHEEL_DELTA_WPARAM(wParam);
POINT pos; POINT pos;
pos.x = GET_X_LPARAM(lParam); pos.x = GET_X_LPARAM(lParam);
pos.y = GET_Y_LPARAM(lParam); pos.y = GET_Y_LPARAM(lParam);
@ -3273,14 +3272,8 @@ LRESULT CMeterWindow::OnMouseHScrollMove(UINT uMsg, WPARAM wParam, LPARAM lParam
// Handle buttons // Handle buttons
HandleButtons(pos, BUTTONPROC_MOVE); HandleButtons(pos, BUTTONPROC_MOVE);
if (delta < 0) const int delta = GET_WHEEL_DELTA_WPARAM(wParam);
{ DoAction(pos.x, pos.y, (delta < 0) ? MOUSE_MW_LEFT : MOUSE_MW_RIGHT, false);
DoAction(pos.x, pos.y, MOUSE_MW_LEFT, false);
}
else
{
DoAction(pos.x, pos.y, MOUSE_MW_RIGHT, false);
}
return 0; return 0;
} }
@ -4466,24 +4459,24 @@ LRESULT CMeterWindow::OnMouseInput(UINT uMsg, WPARAM wParam, LPARAM lParam)
GetCursorPos(&pos); GetCursorPos(&pos);
HWND hwnd = WindowFromPoint(pos); HWND hwnd = WindowFromPoint(pos);
// Only process RAW data if the mouse is over a meter window that does not have focus // Only process for unfocused skin window.
if (Rainmeter->GetMeterWindow(hwnd) && hwnd != GetForegroundWindow()) if (m_Window == hwnd && m_Window != GetFocus())
{ {
RAWINPUT ri; RAWINPUT ri;
UINT riSize = sizeof(ri); UINT riSize = sizeof(ri);
GetRawInputData((HRAWINPUT)lParam, RID_INPUT, &ri, &riSize, sizeof(RAWINPUTHEADER)); GetRawInputData((HRAWINPUT)lParam, RID_INPUT, &ri, &riSize, sizeof(RAWINPUTHEADER));
if (ri.header.dwType == RIM_TYPEMOUSE) if (ri.header.dwType == RIM_TYPEMOUSE)
{ {
WPARAM wparam = MAKEWPARAM(0, HIWORD((short)ri.data.mouse.usButtonData)); WPARAM wheelDelta = MAKEWPARAM(0, HIWORD((short)ri.data.mouse.usButtonData));
LPARAM lparam = MAKELPARAM(pos.x, pos.y); LPARAM wheelPos = MAKELPARAM(pos.x, pos.y);
if (ri.data.mouse.usButtonFlags == RI_MOUSE_WHEEL) if (ri.data.mouse.usButtonFlags == RI_MOUSE_WHEEL)
{ {
PostMessage(hwnd, WM_MOUSEWHEEL, wparam, lparam); OnMouseScrollMove(WM_INPUT, wheelDelta, wheelPos);
} }
else if (ri.data.mouse.usButtonFlags == RI_MOUSE_HORIZONTAL_WHEEL) else if (ri.data.mouse.usButtonFlags == RI_MOUSE_HORIZONTAL_WHEEL)
{ {
PostMessage(hwnd, WM_MOUSEHWHEEL, wparam, lparam); OnMouseHScrollMove(WM_MOUSEHWHEEL, wheelDelta, wheelPos);
} }
} }
} }