diff --git a/Library/Meter.cpp b/Library/Meter.cpp index 6ad90620..89b204b8 100644 --- a/Library/Meter.cpp +++ b/Library/Meter.cpp @@ -272,7 +272,10 @@ void CMeter::ReadConfig(const WCHAR* section) m_MouseOverAction = parser.ReadString(section, L"MouseOverAction", L"", false); m_MouseLeaveAction = parser.ReadString(section, L"MouseLeaveAction", L"", false); - m_MouseActionCursor = 0!= parser.ReadInt(section, L"MouseActionCursor", 1); + if(m_MouseActionCursor == false) + m_MouseActionCursor = 0!= parser.ReadInt(section, L"MouseActionCursor", 0); + else + m_MouseActionCursor = 0!= parser.ReadInt(section, L"MouseActionCursor", 1); m_HasMouseAction = ( !m_MiddleMouseUpAction.empty() || !m_MiddleMouseDownAction.empty() diff --git a/Library/Meter.h b/Library/Meter.h index b3020ebd..22102f0c 100644 --- a/Library/Meter.h +++ b/Library/Meter.h @@ -61,6 +61,7 @@ public: bool HasMouseAction() { return m_HasMouseAction; }; bool HasMouseActionCursor() { return m_MouseActionCursor; }; + void SetMouseActionCursor(bool b) { m_MouseActionCursor = b; }; void Hide() { m_Hidden = true; }; void Show() { m_Hidden = false; }; diff --git a/Library/MeterWindow.cpp b/Library/MeterWindow.cpp index b7e86028..549e32f2 100644 --- a/Library/MeterWindow.cpp +++ b/Library/MeterWindow.cpp @@ -1432,6 +1432,7 @@ void CMeterWindow::ReadSkin() m_WindowUpdate = m_Parser.ReadInt(L"Rainmeter", L"Update", m_WindowUpdate); m_TransitionUpdate = m_Parser.ReadInt(L"Rainmeter", L"TransitionUpdate", m_TransitionUpdate); + m_MouseActionCursor = 0 != m_Parser.ReadInt(L"Rainmeter", L"MouseActionCursor", 1); // Checking for localfonts std::wstring localFont1 = m_Parser.ReadString(L"Rainmeter", L"LocalFont", L""); @@ -1572,6 +1573,12 @@ void CMeterWindow::ReadSkin() if (meter) { meter->SetName(strSection.c_str()); + + if(m_MouseActionCursor == false) + { + meter->SetMouseActionCursor(false); + } + meter->ReadConfig(strSection.c_str()); m_Meters.push_back(meter); } diff --git a/Library/MeterWindow.h b/Library/MeterWindow.h index 0c9929af..f5a4c326 100644 --- a/Library/MeterWindow.h +++ b/Library/MeterWindow.h @@ -326,6 +326,8 @@ private: static int c_InstanceCount; Gdiplus::PrivateFontCollection* m_FontCollection; + + bool m_MouseActionCursor; }; #endif