diff options
Diffstat (limited to 'src/widgets/itemviews/qstyleditemdelegate.cpp')
-rw-r--r-- | src/widgets/itemviews/qstyleditemdelegate.cpp | 44 |
1 files changed, 34 insertions, 10 deletions
diff --git a/src/widgets/itemviews/qstyleditemdelegate.cpp b/src/widgets/itemviews/qstyleditemdelegate.cpp index b121800c31..7e1933ad1e 100644 --- a/src/widgets/itemviews/qstyleditemdelegate.cpp +++ b/src/widgets/itemviews/qstyleditemdelegate.cpp @@ -97,6 +97,7 @@ public: return factory ? factory : QItemEditorFactory::defaultFactory(); } + bool tryFixup(QWidget *editor); void _q_commitDataAndCloseEditor(QWidget *editor) { Q_Q(QStyledItemDelegate); @@ -106,6 +107,24 @@ public: QItemEditorFactory *factory; }; +bool QStyledItemDelegatePrivate::tryFixup(QWidget *editor) +{ +#ifndef QT_NO_LINEEDIT + if (QLineEdit *e = qobject_cast<QLineEdit*>(editor)) { + if (!e->hasAcceptableInput()) { + if (const QValidator *validator = e->validator()) { + QString text = e->text(); + validator->fixup(text); + e->setText(text); + } + return e->hasAcceptableInput(); + } + } +#endif // QT_NO_LINEEDIT + + return true; +} + /*! \class QStyledItemDelegate @@ -622,18 +641,24 @@ void QStyledItemDelegate::setItemEditorFactory(QItemEditorFactory *factory) */ bool QStyledItemDelegate::eventFilter(QObject *object, QEvent *event) { + Q_D(QStyledItemDelegate); + QWidget *editor = qobject_cast<QWidget*>(object); if (!editor) return false; if (event->type() == QEvent::KeyPress) { switch (static_cast<QKeyEvent *>(event)->key()) { case Qt::Key_Tab: - emit commitData(editor); - emit closeEditor(editor, QAbstractItemDelegate::EditNextItem); + if (d->tryFixup(editor)) { + emit commitData(editor); + emit closeEditor(editor, EditNextItem); + } return true; case Qt::Key_Backtab: - emit commitData(editor); - emit closeEditor(editor, QAbstractItemDelegate::EditPreviousItem); + if (d->tryFixup(editor)) { + emit commitData(editor); + emit closeEditor(editor, EditPreviousItem); + } return true; case Qt::Key_Enter: case Qt::Key_Return: @@ -644,11 +669,9 @@ bool QStyledItemDelegate::eventFilter(QObject *object, QEvent *event) // before committing the data (e.g. so it can do // validation/fixup of the input). #endif // QT_NO_TEXTEDIT -#ifndef QT_NO_LINEEDIT - if (QLineEdit *e = qobject_cast<QLineEdit*>(editor)) - if (!e->hasAcceptableInput()) - return false; -#endif // QT_NO_LINEEDIT + if (!d->tryFixup(editor)) + return true; + QMetaObject::invokeMethod(this, "_q_commitDataAndCloseEditor", Qt::QueuedConnection, Q_ARG(QWidget*, editor)); return false; @@ -679,8 +702,9 @@ bool QStyledItemDelegate::eventFilter(QObject *object, QEvent *event) return false; } #endif + if (d->tryFixup(editor)) + emit commitData(editor); - emit commitData(editor); emit closeEditor(editor, NoHint); } } else if (event->type() == QEvent::ShortcutOverride) { |