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

Fixed hittest of Button meter due to lack of compatibility with new "Padding" option

Browse Source
This commit is contained in:
spx 2013-07-21 19:46:13 +09:00
parent 369f8c7082
commit 5f1d1c5888
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Library/MeterButton.cpp
View File

@ -229,11 +229,19 @@ bool MeterButton::HitTest2(int px, int py)
// Check transparent pixels // Check transparent pixels
if (m_Image.IsLoaded()) if (m_Image.IsLoaded())
{ {
Color color; Rect meterRect = GetMeterRectPadding();
Status status = m_Image.GetImage()->GetPixel(px - x + m_W * m_State, py - y, &color); int ix = meterRect.Width * m_State;
if (status != Ok || color.GetA() != 0) px = px - meterRect.X + ix;
py = py - meterRect.Y;
if (px >= ix && px < ix + meterRect.Width &&
py >= 0 && py < meterRect.Height)
{ {
return true; Color color;
Status status = m_Image.GetImage()->GetPixel(px, py, &color);
if (status != Ok || color.GetA() != 0)
{
return true;
}
} }
} }
else else