Buttons are now not clickable when they're hidden
This commit is contained in:
@@ -60,6 +60,10 @@ protected:
|
|||||||
|
|
||||||
virtual bool OnMouseMove(const Events::MouseMove& event)
|
virtual bool OnMouseMove(const Events::MouseMove& event)
|
||||||
{
|
{
|
||||||
|
if (Hidden()) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
bool isOver = Rectangle::Intersects(AbsoluteRectangle(), Rectangle(event.X, event.Y, 1, 1));
|
bool isOver = Rectangle::Intersects(AbsoluteRectangle(), Rectangle(event.X, event.Y, 1, 1));
|
||||||
if (isOver && !m_MouseIsOver) { // Enter
|
if (isOver && !m_MouseIsOver) { // Enter
|
||||||
if (!m_IsDown) {
|
if (!m_IsDown) {
|
||||||
@@ -88,6 +92,11 @@ protected:
|
|||||||
}
|
}
|
||||||
virtual bool OnMousePress(const Events::MousePress& event)
|
virtual bool OnMousePress(const Events::MousePress& event)
|
||||||
{
|
{
|
||||||
|
if (Hidden()) {
|
||||||
|
LOG_DEBUG("Pressed hidden button");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
if (!Rectangle::Intersects(AbsoluteRectangle(), Rectangle(event.X, event.Y, 1, 1))) {
|
if (!Rectangle::Intersects(AbsoluteRectangle(), Rectangle(event.X, event.Y, 1, 1))) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@@ -107,6 +116,11 @@ protected:
|
|||||||
}
|
}
|
||||||
virtual bool OnMouseRelease(const Events::MouseRelease& event)
|
virtual bool OnMouseRelease(const Events::MouseRelease& event)
|
||||||
{
|
{
|
||||||
|
if (Hidden()) {
|
||||||
|
LOG_DEBUG("Released hidden button");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
bool isOver = Rectangle::Intersects(AbsoluteRectangle(), Rectangle(event.X, event.Y, 1, 1));
|
bool isOver = Rectangle::Intersects(AbsoluteRectangle(), Rectangle(event.X, event.Y, 1, 1));
|
||||||
if (!isOver && !m_IsDown) {
|
if (!isOver && !m_IsDown) {
|
||||||
return false;
|
return false;
|
||||||
|
|||||||
Reference in New Issue
Block a user