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

Changed Button meter behavior. Now ignores transparent area of the button when mouseover.

Browse Source
This commit is contained in:
spx 2013-07-16 12:26:31 +09:00
parent 8bf1f6aec8
commit ed9ea73e6b
3 changed files with 33 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Library/MeterButton.cpp
View File

@ -210,7 +210,7 @@ void MeterButton::BindMeasures(ConfigParser& parser, const WCHAR* section)
** Checks if the given point is inside the button. ** Checks if the given point is inside the button.
** **
*/ */
bool MeterButton::HitTest2(int px, int py, bool checkAlpha) bool MeterButton::HitTest2(int px, int py)
{ {
int x = GetX(); int x = GetX();
int y = GetY(); int y = GetY();
@ -219,24 +219,17 @@ bool MeterButton::HitTest2(int px, int py, bool checkAlpha)
px >= x && px < x + m_W && px >= x && px < x + m_W &&
py >= y && py < y + m_H) py >= y && py < y + m_H)
{ {
if (checkAlpha) if (m_SolidColor.GetA() != 0 || m_SolidColor2.GetA() != 0)
{ {
if (m_SolidColor.GetA() != 0 || m_SolidColor2.GetA() != 0) return true;
{ }
return true;
}
// Check transparent pixels // Check transparent pixels
if (m_Image.IsLoaded()) if (m_Image.IsLoaded())
{ {
Color color; Color color;
Status status = m_Image.GetImage()->GetPixel(px - x + m_W * m_State, py - y, &color); Status status = m_Image.GetImage()->GetPixel(px - x + m_W * m_State, py - y, &color);
if (status != Ok || color.GetA() != 0) if (status != Ok || color.GetA() != 0)
{
return true;
}
}
else
{ {
return true; return true;
} }
@ -253,7 +246,7 @@ bool MeterButton::MouseUp(POINT pos, bool execute)
{ {
if (m_State == BUTTON_STATE_DOWN) if (m_State == BUTTON_STATE_DOWN)
{ {
if (execute && m_Clicked && m_Focus && HitTest2(pos.x, pos.y, true)) if (execute && m_Clicked && m_Focus && HitTest2(pos.x, pos.y))
{ {
GetRainmeter().ExecuteCommand(m_Command.c_str(), m_MeterWindow); GetRainmeter().ExecuteCommand(m_Command.c_str(), m_MeterWindow);
} }
@ -268,7 +261,7 @@ bool MeterButton::MouseUp(POINT pos, bool execute)
bool MeterButton::MouseDown(POINT pos) bool MeterButton::MouseDown(POINT pos)
{ {
if (m_Focus && HitTest2(pos.x, pos.y, true)) if (m_Focus && HitTest2(pos.x, pos.y))
{ {
m_State = BUTTON_STATE_DOWN; m_State = BUTTON_STATE_DOWN;
m_Clicked = true; m_Clicked = true;
@ -281,7 +274,7 @@ bool MeterButton::MouseMove(POINT pos)
{ {
if (m_Clicked) if (m_Clicked)
{ {
if (HitTest2(pos.x, pos.y, true)) if (HitTest2(pos.x, pos.y))
{ {
if (m_State == BUTTON_STATE_NORMAL) if (m_State == BUTTON_STATE_NORMAL)
{ {
@ -306,7 +299,7 @@ bool MeterButton::MouseMove(POINT pos)
} }
else else
{ {
if (HitTest2(pos.x, pos.y, false)) if (HitTest2(pos.x, pos.y))
{ {
if (m_State == BUTTON_STATE_NORMAL) if (m_State == BUTTON_STATE_NORMAL)
{ {

4
Library/MeterButton.h
View File

@ -42,6 +42,8 @@ public:
void SetFocus(bool f) { m_Focus = f; } void SetFocus(bool f) { m_Focus = f; }
bool HitTest2(int px, int py);
protected: protected:
virtual void ReadOptions(ConfigParser& parser, const WCHAR* section); virtual void ReadOptions(ConfigParser& parser, const WCHAR* section);
virtual void BindMeasures(ConfigParser& parser, const WCHAR* section); virtual void BindMeasures(ConfigParser& parser, const WCHAR* section);
@ -49,8 +51,6 @@ protected:
virtual bool IsFixedSize(bool overwrite = false) { return overwrite; } virtual bool IsFixedSize(bool overwrite = false) { return overwrite; }
private: private:
bool HitTest2(int px, int py, bool checkAlpha);
TintedImage m_Image; TintedImage m_Image;
std::wstring m_ImageName; std::wstring m_ImageName;
bool m_NeedsReload; bool m_NeedsReload;

22
Library/MeterWindow.cpp
View File

@ -3181,12 +3181,24 @@ void MeterWindow::HandleButtons(POINT pos, BUTTONPROC proc, bool execute)
} }
} }
if (!cursor && // Get cursor if required
((*j)->HasMouseAction() || button) && if (!cursor && (*j)->GetMouse().GetCursorState())
(*j)->GetMouse().GetCursorState() &&
(*j)->HitTest(pos.x, pos.y))
{ {
cursor = (*j)->GetMouse().GetCursor(); if ((*j)->HasMouseAction())
{
if ((*j)->HitTest(pos.x, pos.y))
{
cursor = (*j)->GetMouse().GetCursor();
}
}
else
{
// Special case for Button meter: reacts only on valid pixel in button image
if (button && button->HitTest2(pos.x, pos.y))
{
cursor = (*j)->GetMouse().GetCursor();
}
}
} }
} }