AppFwk: Do not toggle item when tree item editor widget (QLineEdit) is closed with Enter key

This commit is contained in:
Magne Sjaastad
2016-07-25 18:25:14 +02:00
parent fa19a74dcc
commit 512f8904de
5 changed files with 38 additions and 11 deletions

View File

@@ -101,17 +101,20 @@ bool RiuTreeViewEventFilter::eventFilter(QObject *obj, QEvent *event)
return true;
}
switch (keyEvent->key())
if (!RiuMainWindow::instance()->projectTreeView()->isTreeItemEditWidgetActive())
{
case Qt::Key_Space:
case Qt::Key_Enter:
case Qt::Key_Return:
case Qt::Key_Select:
switch (keyEvent->key())
{
RicToggleItemsFeatureImpl::setObjectToggleStateForSelection(RicToggleItemsFeatureImpl::TOGGLE);
case Qt::Key_Space:
case Qt::Key_Enter:
case Qt::Key_Return:
case Qt::Key_Select:
{
RicToggleItemsFeatureImpl::setObjectToggleStateForSelection(RicToggleItemsFeatureImpl::TOGGLE);
keyEvent->setAccepted(true);
return true;
keyEvent->setAccepted(true);
return true;
}
}
}
}