some fancy

This commit is contained in:
Eduardo Bart
2011-08-26 15:56:56 -03:00
parent 0749e6a9d5
commit ccc4c1ba5e
3 changed files with 11 additions and 3 deletions

View File

@@ -503,7 +503,7 @@ void UIWidget::updateState(WidgetState state)
UIWidgetPtr parent;
do {
parent = widget->getParent();
if(!widget->getRect().contains(mousePos) ||
if(!widget->isExplicitlyEnabled() || !widget->getRect().contains(mousePos) ||
(parent && widget != parent->getChildByPos(mousePos))) {
newStatus = false;
break;
@@ -514,14 +514,16 @@ void UIWidget::updateState(WidgetState state)
newStatus = m_pressed;
}
else if(state == DisabledState) {
bool enabled = true;
updateChildren = true;
UIWidgetPtr widget = asUIWidget();
do {
if(!widget->isExplicitlyEnabled()) {
newStatus = false;
enabled = false;
break;
}
} while(widget = widget->getParent());
newStatus = !enabled;
}
else {
return;