|
@@ -608,7 +608,7 @@ bool Container::keyEvent(Keyboard::KeyEvent evt, int key)
|
|
|
{
|
|
{
|
|
|
Control* control = *it;
|
|
Control* control = *it;
|
|
|
GP_ASSERT(control);
|
|
GP_ASSERT(control);
|
|
|
- if (!control->isEnabled())
|
|
|
|
|
|
|
+ if (!control->isEnabled() || !control->isVisible())
|
|
|
{
|
|
{
|
|
|
continue;
|
|
continue;
|
|
|
}
|
|
}
|
|
@@ -1024,7 +1024,7 @@ bool Container::mouseEventScroll(Mouse::MouseEvent evt, int x, int y, int wheelD
|
|
|
|
|
|
|
|
bool Container::pointerEvent(bool mouse, char evt, int x, int y, int data)
|
|
bool Container::pointerEvent(bool mouse, char evt, int x, int y, int data)
|
|
|
{
|
|
{
|
|
|
- if (!isEnabled())
|
|
|
|
|
|
|
+ if (!isEnabled() || !isVisible())
|
|
|
{
|
|
{
|
|
|
return false;
|
|
return false;
|
|
|
}
|
|
}
|
|
@@ -1051,7 +1051,7 @@ bool Container::pointerEvent(bool mouse, char evt, int x, int y, int data)
|
|
|
{
|
|
{
|
|
|
Control* control = *it;
|
|
Control* control = *it;
|
|
|
GP_ASSERT(control);
|
|
GP_ASSERT(control);
|
|
|
- if (!control->isEnabled())
|
|
|
|
|
|
|
+ if (!control->isEnabled() || !control->isVisible())
|
|
|
{
|
|
{
|
|
|
continue;
|
|
continue;
|
|
|
}
|
|
}
|
|
@@ -1085,7 +1085,7 @@ bool Container::pointerEvent(bool mouse, char evt, int x, int y, int data)
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- if (!isEnabled())
|
|
|
|
|
|
|
+ if (!isEnabled() || !isVisible())
|
|
|
{
|
|
{
|
|
|
release();
|
|
release();
|
|
|
return (_consumeInputEvents | eventConsumed);
|
|
return (_consumeInputEvents | eventConsumed);
|