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

Modified. (Added the workaround for MessageBox loops on MouseOverAction.)

Browse Source
This commit is contained in:
spx 2010-12-24 10:47:31 +00:00
parent 35174f0f4a
commit 34160d4038
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Library/MeterWindow.cpp
View File

@ -130,6 +130,7 @@ CMeterWindow::CMeterWindow(const std::wstring& path, const std::wstring& config,
m_SolidBevel = BEVELTYPE_NONE; m_SolidBevel = BEVELTYPE_NONE;
m_UpdateCounter = 0; m_UpdateCounter = 0;
m_MouseMoveCounter = 0;
m_FontCollection = NULL; m_FontCollection = NULL;
++c_InstanceCount; ++c_InstanceCount;
@ -3071,6 +3072,8 @@ LRESULT CMeterWindow::OnMouseMove(UINT uMsg, WPARAM wParam, LPARAM lParam)
MapWindowPoints(NULL, m_Window, &pos, 1); MapWindowPoints(NULL, m_Window, &pos, 1);
} }
++m_MouseMoveCounter;
while (DoMoveAction(pos.x, pos.y, MOUSE_LEAVE)) ; while (DoMoveAction(pos.x, pos.y, MOUSE_LEAVE)) ;
while (DoMoveAction(pos.x, pos.y, MOUSE_OVER)) ; while (DoMoveAction(pos.x, pos.y, MOUSE_OVER)) ;
@ -3094,6 +3097,8 @@ LRESULT CMeterWindow::OnMouseLeave(UINT uMsg, WPARAM wParam, LPARAM lParam)
HWND hWnd = WindowFromPoint(pos); HWND hWnd = WindowFromPoint(pos);
if (!hWnd || (hWnd != m_Window && GetParent(hWnd) != m_Window)) // ignore tooltips if (!hWnd || (hWnd != m_Window && GetParent(hWnd) != m_Window)) // ignore tooltips
{ {
++m_MouseMoveCounter;
POINT pos = {SHRT_MIN, SHRT_MIN}; POINT pos = {SHRT_MIN, SHRT_MIN};
while (DoMoveAction(pos.x, pos.y, MOUSE_LEAVE)) ; // Leave all forcibly while (DoMoveAction(pos.x, pos.y, MOUSE_LEAVE)) ; // Leave all forcibly
@ -4221,8 +4226,9 @@ bool CMeterWindow::DoMoveAction(int x, int y, MOUSE mouse)
if (!m_MouseOverAction.empty()) if (!m_MouseOverAction.empty())
{ {
UINT currCounter = m_MouseMoveCounter;
m_Rainmeter->ExecuteCommand(m_MouseOverAction.c_str(), this); m_Rainmeter->ExecuteCommand(m_MouseOverAction.c_str(), this);
return true; return (currCounter == m_MouseMoveCounter);
} }
} }
@ -4262,8 +4268,9 @@ bool CMeterWindow::DoMoveAction(int x, int y, MOUSE mouse)
if (!((*j)->GetMouseOverAction().empty())) if (!((*j)->GetMouseOverAction().empty()))
{ {
UINT currCounter = m_MouseMoveCounter;
m_Rainmeter->ExecuteCommand((*j)->GetMouseOverAction().c_str(), this); m_Rainmeter->ExecuteCommand((*j)->GetMouseOverAction().c_str(), this);
return true; return (currCounter == m_MouseMoveCounter);
} }
} }
} }
@ -4314,8 +4321,9 @@ bool CMeterWindow::DoMoveAction(int x, int y, MOUSE mouse)
if (!m_MouseOverAction.empty()) if (!m_MouseOverAction.empty())
{ {
UINT currCounter = m_MouseMoveCounter;
m_Rainmeter->ExecuteCommand(m_MouseOverAction.c_str(), this); m_Rainmeter->ExecuteCommand(m_MouseOverAction.c_str(), this);
return true; return (currCounter == m_MouseMoveCounter);
} }
} }
} }

1
Library/MeterWindow.h
View File

@ -378,6 +378,7 @@ private:
const std::wstring m_SkinIniFile; // Name of the current skin iniFile const std::wstring m_SkinIniFile; // Name of the current skin iniFile
int m_UpdateCounter; int m_UpdateCounter;
UINT m_MouseMoveCounter;
CRainmeter* m_Rainmeter; // Pointer to the main object CRainmeter* m_Rainmeter; // Pointer to the main object