diff options
author | Ivan Komissarov <ABBAPOH@me.com> | 2012-04-14 12:14:22 +0400 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-05-07 22:43:14 +0200 |
commit | 0866e48ae25f53eb9b27b0b86d333700f912459f (patch) | |
tree | bed2d7932a67f64633999a1f0f92860cf6c46776 /src/widgets | |
parent | 9953393593e885d981331a2e01bc9f2c868b939a (diff) |
Fixed applying invalid data from QLineEdit to model
Task-number: QTBUG-2216
Change-Id: I5d1c18aadb380667dedc2bb9f9b7e3dd8178a24c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Reviewed-by: David Faure <david.faure@kdab.com>
Diffstat (limited to 'src/widgets')
-rw-r--r-- | src/widgets/itemviews/qitemdelegate.cpp | 44 | ||||
-rw-r--r-- | src/widgets/itemviews/qstyleditemdelegate.cpp | 44 |
2 files changed, 68 insertions, 20 deletions
diff --git a/src/widgets/itemviews/qitemdelegate.cpp b/src/widgets/itemviews/qitemdelegate.cpp index 7d8512adc4..c040322ba1 100644 --- a/src/widgets/itemviews/qitemdelegate.cpp +++ b/src/widgets/itemviews/qitemdelegate.cpp @@ -113,6 +113,7 @@ public: static QString valueToText(const QVariant &value, const QStyleOptionViewItem &option); + bool tryFixup(QWidget *editor); void _q_commitDataAndCloseEditor(QWidget *editor); QItemEditorFactory *f; @@ -386,6 +387,24 @@ QString QItemDelegatePrivate::valueToText(const QVariant &value, const QStyleOpt return text; } +bool QItemDelegatePrivate::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; +} + /*! Renders the delegate using the given \a painter and style \a option for the item specified by \a index. @@ -1154,18 +1173,24 @@ QRect QItemDelegate::textRectangle(QPainter * /*painter*/, const QRect &rect, bool QItemDelegate::eventFilter(QObject *object, QEvent *event) { + Q_D(QItemDelegate); + 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: @@ -1176,11 +1201,9 @@ bool QItemDelegate::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; @@ -1211,8 +1234,9 @@ bool QItemDelegate::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) { 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) { |