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

1) Added MattKing's code for supporting the middle mouse button in [Rainmeter] and [MeasureName].

Browse Source 
MiddleMouseUpAction | MiddleMouseDownAction

2) Updated the manual entries for the middle mouse functionality

3) Added  spx268's code to fix a problem with BUTTON and dynamic variables addressed in:

http://code.google.com/p/rainmeter/issues/detail?id=108
This commit is contained in:
jsmorley
2009-09-07 16:37:58 +00:00
parent 11528ab3cc
commit 48bee2c6fe
6 changed files with 123 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
Library/MeterImage.cpp
View File

@ -37,6 +37,7 @@ using namespace Gdiplus;
CMeterImage::CMeterImage(CMeterWindow* meterWindow) : CMeter(meterWindow)
{
m_Bitmap = NULL;
m_NeedsUpdate = false;
m_WidthDefined = false;
m_HeightDefined = false;
m_PreserveAspectRatio = false;
@ -71,7 +72,7 @@ void CMeterImage::Initialize()
{
CMeter::Initialize();
LoadImage(true);
if (!m_DynamicVariables) LoadImage(true);
}
/*
@ -197,8 +198,6 @@ void CMeterImage::ReadConfig(const WCHAR* section)
CConfigParser& parser = m_MeterWindow->GetParser();
m_ImageName = parser.ReadString(section, L"ImageName", L"");
m_Path = parser.ReadString(section, L"Path", L"");
if (!m_Path.empty())
{
@ -207,7 +206,19 @@ void CMeterImage::ReadConfig(const WCHAR* section)
m_Path += L"\\";
}
}
m_ImageName = m_MeterWindow->MakePathAbsolute(m_Path + m_ImageName);
if (!m_Measure)
{
std::wstring oldImageName = m_ImageName;
m_ImageName = parser.ReadString(section, L"ImageName", L"");
m_ImageName = m_MeterWindow->MakePathAbsolute(m_Path + m_ImageName);
if (m_DynamicVariables)
{
m_NeedsUpdate = (oldImageName != m_ImageName);
}
}
m_PreserveAspectRatio = 0!=parser.ReadInt(section, L"PreserveAspectRatio", 0);
@ -229,24 +240,31 @@ void CMeterImage::ReadConfig(const WCHAR* section)
*/
bool CMeterImage::Update()
{
if (CMeter::Update() && m_Measure)
if (CMeter::Update())
{
std::wstring val = m_Measure->GetStringValue(false, 1, 0, false);
if (!val.empty())
if (m_Measure) //read from the measure
{
// Load the new image
val = m_MeterWindow->MakePathAbsolute(m_Path + val);
if (val != m_ImageName)
std::wstring val = m_Measure->GetStringValue(false, 1, 0, false);
if (!val.empty())
{
m_ImageName = val;
LoadImage(true);
}
else
{
LoadImage(false);
val = m_MeterWindow->MakePathAbsolute(m_Path + val);
if (val != m_ImageName)
{
m_ImageName = val;
LoadImage(true);
}
else
{
LoadImage(false);
}
}
return true;
}
else if (m_DynamicVariables) //read from the skin
{
LoadImage(m_NeedsUpdate);
return true;
}
return true;
}
return false;
}