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

MouseVariables: Changed X,Y origin 1 to 0.

Browse Source 
Code cleanup
This commit is contained in:
spx 2013-01-16 23:09:06 +09:00
parent 9375b5013c
commit c807d270b5
1 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Library/Mouse.cpp
View File

@ -233,34 +233,42 @@ void CMouse::ReplaceMouseVariables(std::wstring& result) const
std::wstring CMouse::GetMouseVariable(const std::wstring& variable) const std::wstring CMouse::GetMouseVariable(const std::wstring& variable) const
{ {
std::wstring result; std::wstring result;
LPCWSTR var = variable.c_str();
WCHAR buffer[32];
POINT pt; POINT pt;
GetCursorPos(&pt); GetCursorPos(&pt);
if (_wcsnicmp(variable.c_str(), L"MOUSEX", 6) == 0) if (_wcsnicmp(var, L"MOUSEX", 6) == 0)
{ {
double xOffset = (double)(m_MeterWindow->GetX() + (m_Meter ? m_Meter->GetX() : 0) - 1); var += 6;
if (_wcsicmp(variable.c_str(), L"MOUSEX:%") == 0) int xOffset = m_MeterWindow->GetX() + (m_Meter ? m_Meter->GetX() : 0);
if (wcscmp(var, L":%") == 0) // $MOUSEX:%$
{ {
xOffset = ((pt.x - xOffset) / (m_Meter ? m_Meter->GetW() : m_MeterWindow->GetW())) * 100; xOffset = (int)(((pt.x - xOffset + 1) / (double)(m_Meter ? m_Meter->GetW() : m_MeterWindow->GetW())) * 100);
result = std::to_wstring((int)xOffset); _itow_s(xOffset, buffer, 10);
result = buffer;
} }
else else if (*var == L'\0') // $MOUSEX$
{ {
result = std::to_wstring((long)(pt.x - xOffset)); _itow_s(pt.x - xOffset, buffer, 10);
result = buffer;
} }
} }
else if (_wcsnicmp(variable.c_str(), L"MOUSEY", 6) == 0) else if (_wcsnicmp(var, L"MOUSEY", 6) == 0)
{ {
double yOffset = (double)(m_MeterWindow->GetY() + (m_Meter ? m_Meter->GetY() : 0) - 1); var += 6;
if (_wcsicmp(variable.c_str(), L"MOUSEY:%") == 0) int yOffset = m_MeterWindow->GetY() + (m_Meter ? m_Meter->GetY() : 0);
if (wcscmp(var, L":%") == 0) // $MOUSEY:%$
{ {
yOffset = ((pt.y - yOffset) / (m_Meter ? m_Meter->GetH() : m_MeterWindow->GetH())) * 100; yOffset = (int)(((pt.y - yOffset + 1) / (double)(m_Meter ? m_Meter->GetH() : m_MeterWindow->GetH())) * 100);
result = std::to_wstring((int)yOffset); _itow_s(yOffset, buffer, 10);
result = buffer;
} }
else else if (*var == L'\0') // $MOUSEY$
{ {
result = std::to_wstring((long)(pt.y - yOffset)); _itow_s(pt.y - yOffset, buffer, 10);
result = buffer;
} }
} }