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

Added special mouse variables

Browse Source
This commit is contained in:
Brian Ferguson
2013-01-15 17:51:02 -07:00
parent e2c88e0946
commit 9da869363d
3 changed files with 135 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Library/MeterWindow.cpp
View File

@ -4300,7 +4300,7 @@ LRESULT CMeterWindow::OnContextMenu(UINT uMsg, WPARAM wParam, LPARAM lParam)
*/
bool CMeterWindow::DoAction(int x, int y, MOUSEACTION action, bool test)
{
const WCHAR* command = NULL;
std::wstring command = L"";
// Check if the hitpoint was over some meter
std::vector<CMeter*>::const_reverse_iterator j = m_Meters.rbegin();
@ -4309,24 +4309,24 @@ bool CMeterWindow::DoAction(int x, int y, MOUSEACTION action, bool test)
// Hidden meters are ignored
if ((*j)->IsHidden()) continue;
const WCHAR* meterCommand = (*j)->GetMouse().GetActionCommand(action);
if (meterCommand && (*j)->HitTest(x, y))
std::wstring meterCommand = (*j)->GetMouse().GetActionCommand(action);
if (!meterCommand.empty() && (*j)->HitTest(x, y))
{
command = meterCommand;
break;
}
}
if (!command && HitTest(x, y))
if (command.empty() && HitTest(x, y))
{
command = m_Mouse.GetActionCommand(action);
command = m_Mouse.GetActionCommand(action).c_str();
}
if (command)
if (!command.empty())
{
if (!test)
{
Rainmeter->ExecuteCommand(command, this);
Rainmeter->ExecuteCommand(command.c_str(), this);
}
return true;