From 98a4aa10ef09087ce6498d09461036cb0ab9cb4d Mon Sep 17 00:00:00 2001 From: Peter Penz Date: Fri, 8 Jun 2012 16:39:13 +0200 Subject: Inline renaming fixes - Don't use an outdated KFileItem when renaming an item more than once - Use the same font as the view - Don't lose the focus when an editor-popup is shown BUG: 299327 BUG: 298883 BUG: 301253 FIXED-IN: 4.9.0 --- src/kitemviews/private/kitemlistroleeditor.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'src/kitemviews/private/kitemlistroleeditor.cpp') diff --git a/src/kitemviews/private/kitemlistroleeditor.cpp b/src/kitemviews/private/kitemlistroleeditor.cpp index 815da4c70..594b05338 100644 --- a/src/kitemviews/private/kitemlistroleeditor.cpp +++ b/src/kitemviews/private/kitemlistroleeditor.cpp @@ -29,11 +29,14 @@ KItemListRoleEditor::KItemListRoleEditor(QWidget *parent) : { setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); + setAcceptRichText(false); document()->setDocumentMargin(0); if (parent) { parent->installEventFilter(this); } + + connect(this, SIGNAL(textChanged()), this, SLOT(autoAdjustSize())); } KItemListRoleEditor::~KItemListRoleEditor() @@ -60,7 +63,7 @@ QByteArray KItemListRoleEditor::role() const return m_role; } -bool KItemListRoleEditor::eventFilter(QObject* watched, QEvent* event) +bool KItemListRoleEditor::eventFilter(QObject* watched, QEvent* event) { if (watched == parentWidget() && event->type() == QEvent::Resize) { emit roleEditingFinished(m_index, m_role, toPlainText()); @@ -72,7 +75,10 @@ bool KItemListRoleEditor::eventFilter(QObject* watched, QEvent* event) bool KItemListRoleEditor::event(QEvent* event) { if (event->type() == QEvent::FocusOut) { - emit roleEditingFinished(m_index, m_role, toPlainText()); + QFocusEvent* focusEvent = static_cast(event); + if (focusEvent->reason() != Qt::PopupFocusReason) { + emit roleEditingFinished(m_index, m_role, toPlainText()); + } } return KTextEdit::event(event); } @@ -94,7 +100,6 @@ void KItemListRoleEditor::keyPressEvent(QKeyEvent* event) } KTextEdit::keyPressEvent(event); - autoAdjustSize(); } void KItemListRoleEditor::autoAdjustSize() -- cgit v1.3.1