From 371d21cb35febd29db73e87c5b3de1c46e18a01e Mon Sep 17 00:00:00 2001 From: sippeangelo Date: Mon, 5 Oct 2015 14:27:27 +0200 Subject: [PATCH] Buttons are now not clickable when they're hidden --- include/GUI/Button.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/include/GUI/Button.h b/include/GUI/Button.h index b2a665d..d46d929 100644 --- a/include/GUI/Button.h +++ b/include/GUI/Button.h @@ -60,6 +60,10 @@ protected: virtual bool OnMouseMove(const Events::MouseMove& event) { + if (Hidden()) { + return false; + } + bool isOver = Rectangle::Intersects(AbsoluteRectangle(), Rectangle(event.X, event.Y, 1, 1)); if (isOver && !m_MouseIsOver) { // Enter if (!m_IsDown) { @@ -88,6 +92,11 @@ protected: } 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))) { return false; } @@ -107,6 +116,11 @@ protected: } 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)); if (!isOver && !m_IsDown) { return false;