ctrl+g kinda working, but login/logout events still need a remake

This commit is contained in:
Eduardo Bart
2011-08-29 11:14:21 -03:00
parent b859f66952
commit 8b2cb410c2
27 changed files with 323 additions and 148 deletions

View File

@@ -167,6 +167,18 @@ void UIWidget::setRect(const Rect& rect)
m_updateEventScheduled = true;
}
void UIWidget::lock()
{
if(UIWidgetPtr parent = getParent())
parent->lockChild(asUIWidget());
}
void UIWidget::unlock()
{
if(UIWidgetPtr parent = getParent())
parent->unlockChild(asUIWidget());
}
bool UIWidget::isVisible()
{
if(!m_visible)
@@ -365,8 +377,11 @@ void UIWidget::removeChild(const UIWidgetPtr& child)
auto it = std::find(m_children.begin(), m_children.end(), child);
if(it != m_children.end()) {
// defocus if needed
if(m_focusedChild == child)
bool focusAnother = false;
if(m_focusedChild == child) {
focusChild(nullptr, Fw::ActiveFocusReason);
focusAnother = true;
}
// unlock child if it was locked
unlockChild(child);
@@ -381,6 +396,9 @@ void UIWidget::removeChild(const UIWidgetPtr& child)
// update child states
child->updateStates();
if(focusAnother)
focusPreviousChild(Fw::ActiveFocusReason);
} else
logError("attempt to remove an unknown child from a UIWidget");
}