diff options
Diffstat (limited to 'src/kitemviews')
| -rw-r--r-- | src/kitemviews/kstandarditemlistwidget.cpp | 17 | ||||
| -rw-r--r-- | src/kitemviews/kstandarditemlistwidget.h | 6 |
2 files changed, 19 insertions, 4 deletions
diff --git a/src/kitemviews/kstandarditemlistwidget.cpp b/src/kitemviews/kstandarditemlistwidget.cpp index 4a0ad07f9..69f818c4e 100644 --- a/src/kitemviews/kstandarditemlistwidget.cpp +++ b/src/kitemviews/kstandarditemlistwidget.cpp @@ -688,8 +688,7 @@ void KStandardItemListWidget::slotRoleEditingCanceled(int index, const QByteArray& role, const QVariant& value) { - m_roleEditor->deleteLater(); - m_roleEditor = 0; + closeRoleEditor(); emit roleEditingCanceled(index, role, value); setEditedRole(QByteArray()); } @@ -698,8 +697,7 @@ void KStandardItemListWidget::slotRoleEditingFinished(int index, const QByteArray& role, const QVariant& value) { - m_roleEditor->deleteLater(); - m_roleEditor = 0; + closeRoleEditor(); emit roleEditingFinished(index, role, value); setEditedRole(QByteArray()); } @@ -1241,6 +1239,17 @@ QRectF KStandardItemListWidget::roleEditingRect(const QByteArray& role) const return rect; } +void KStandardItemListWidget::closeRoleEditor() +{ + if (m_roleEditor->hasFocus()) { + // If the editing was not ended by a FocusOut event, we have + // to transfer the keyboard focus back to the KItemListContainer. + scene()->views()[0]->parentWidget()->setFocus(); + } + m_roleEditor->deleteLater(); + m_roleEditor = 0; +} + QPixmap KStandardItemListWidget::pixmapForIcon(const QString& name, int size) { const KIcon icon(name); diff --git a/src/kitemviews/kstandarditemlistwidget.h b/src/kitemviews/kstandarditemlistwidget.h index 76b0d143c..222d7b5f4 100644 --- a/src/kitemviews/kstandarditemlistwidget.h +++ b/src/kitemviews/kstandarditemlistwidget.h @@ -165,6 +165,12 @@ private: QRectF roleEditingRect(const QByteArray &role) const; + /** + * Closes the role editor and returns the focus back + * to the KItemListContainer. + */ + void closeRoleEditor(); + static QPixmap pixmapForIcon(const QString& name, int size); /** |