Merge remote-tracking branch 'origin/KDE/4.9'

[dolphin.git] / src / kitemviews / private / kitemlistroleeditor.cpp

diff --git a/src/kitemviews/private/kitemlistroleeditor.cpp b/src/kitemviews/private/kitemlistroleeditor.cpp
index 55af6a9c7747e752e22867548032410bbe72231a..78dbfe95be72958d5a62305f642d16ec9a2cddd9 100644 (file)
--- a/src/kitemviews/private/kitemlistroleeditor.cpp
+++ b/src/kitemviews/private/kitemlistroleeditor.cpp
@@ -25,15 +25,21 @@
 KItemListRoleEditor::KItemListRoleEditor(QWidget *parent) :
     KTextEdit(parent),
     m_index(0),
-    m_role()
+    m_role(),
+    m_blockFinishedSignal(false),
+    m_eventHandlingLevel(0),
+    m_deleteAfterEventHandling(false)
 {
     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,10 +66,24 @@ QByteArray KItemListRoleEditor::role() const
     return m_role;
 }
 
-bool  KItemListRoleEditor::eventFilter(QObject* watched, QEvent* event)
+void KItemListRoleEditor::deleteWhenIdle()
+{
+    if (m_eventHandlingLevel > 0) {
+        // We are handling an event at the moment. It could be that we
+        // are in a nested event loop run by contextMenuEvent() or a
+        // call of mousePressEvent() which results in drag&drop.
+        // -> do not call deleteLater() to prevent a crash when we
+        //    return from the nested event loop.
+        m_deleteAfterEventHandling = true;
+    } else {
+        deleteLater();
+    }
+}
+
+bool KItemListRoleEditor::eventFilter(QObject* watched, QEvent* event)
 {
     if (watched == parentWidget() && event->type() == QEvent::Resize) {
-        autoAdjustSize();
+        emitRoleEditingFinished();
     }
 
     return KTextEdit::eventFilter(watched, event);
@@ -71,22 +91,61 @@ bool  KItemListRoleEditor::eventFilter(QObject* watched, QEvent* event)
 
 bool KItemListRoleEditor::event(QEvent* event)
 {
+    ++m_eventHandlingLevel;
+
     if (event->type() == QEvent::FocusOut) {
-        emit roleEditingFinished(m_index, m_role, toPlainText());
+        QFocusEvent* focusEvent = static_cast<QFocusEvent*>(event);
+        if (focusEvent->reason() != Qt::PopupFocusReason) {
+            emitRoleEditingFinished();
+        }
+    }
+
+    const int result = KTextEdit::event(event);
+    --m_eventHandlingLevel;
+
+    if (m_deleteAfterEventHandling && m_eventHandlingLevel == 0) {
+        // Schedule this object for deletion and make sure that we do not try
+        // to deleteLater() again when the DeferredDelete event is received.
+        deleteLater();
+        m_deleteAfterEventHandling = false;
     }
-    return KTextEdit::event(event);
+
+    return result;
+}
+
+bool KItemListRoleEditor::viewportEvent(QEvent* event)
+{
+    ++m_eventHandlingLevel;
+    const bool result = KTextEdit::viewportEvent(event);
+    --m_eventHandlingLevel;
+
+    if (m_deleteAfterEventHandling && m_eventHandlingLevel == 0) {
+        // Schedule this object for deletion and make sure that we do not try
+        // to deleteLater() again when the DeferredDelete event is received.
+        deleteLater();
+        m_deleteAfterEventHandling = false;
+    }
+
+    return result;
 }
 
 void KItemListRoleEditor::keyPressEvent(QKeyEvent* event)
 {
     switch (event->key()) {
     case Qt::Key_Escape:
+        // Emitting the signal roleEditingCanceled might result
+        // in losing the focus. Per default losing the focus emits
+        // a roleEditingFinished signal (see KItemListRoleEditor::event),
+        // which is not wanted in this case.
+        m_blockFinishedSignal = true;
         emit roleEditingCanceled(m_index, m_role, toPlainText());
+        m_blockFinishedSignal = false;
         event->accept();
         return;
     case Qt::Key_Enter:
     case Qt::Key_Return:
-        emit roleEditingFinished(m_index, m_role, toPlainText());
+        // TODO: find a better way to fix the bug 309760
+        clearFocus(); // emitRoleEditingFinished(); results in a crash
         event->accept();
         return;
     default:
@@ -94,20 +153,38 @@ void KItemListRoleEditor::keyPressEvent(QKeyEvent* event)
     }
 
     KTextEdit::keyPressEvent(event);
-    autoAdjustSize();
 }
 
 void KItemListRoleEditor::autoAdjustSize()
 {
+    const qreal frameBorder = 2 * frameWidth();
+
     const qreal requiredWidth = document()->size().width();
-    const qreal availableWidth = size().width() - 2 * frameWidth();
+    const qreal availableWidth = size().width() - frameBorder;
     if (requiredWidth > availableWidth) {
-        qreal newWidth = requiredWidth + 2 * frameWidth();
+        qreal newWidth = requiredWidth + frameBorder;
         if (parentWidget() && pos().x() + newWidth > parentWidget()->width()) {
             newWidth = parentWidget()->width() - pos().x();
         }
         resize(newWidth, size().height());
     }
+
+    const qreal requiredHeight = document()->size().height();
+    const qreal availableHeight = size().height() - frameBorder;
+    if (requiredHeight > availableHeight) {
+        qreal newHeight = requiredHeight + frameBorder;
+        if (parentWidget() && pos().y() + newHeight > parentWidget()->height()) {
+            newHeight = parentWidget()->height() - pos().y();
+        }
+        resize(size().width(), newHeight);
+    }
+}
+
+void KItemListRoleEditor::emitRoleEditingFinished()
+{
+    if (!m_blockFinishedSignal) {
+        emit roleEditingFinished(m_index, m_role, toPlainText());
+    }
 }
 
 #include "kitemlistroleeditor.moc"