SVN_SILENT made messages (.desktop file) - always resolve ours

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

diff --git a/src/kitemviews/private/kitemlistroleeditor.cpp b/src/kitemviews/private/kitemlistroleeditor.cpp
index cc10bd58ae58ea75ba6262724577db99c8441d03..895a97aea84c6daa9d4a564dd2bc25d9078e44dc 100644 (file)
--- a/src/kitemviews/private/kitemlistroleeditor.cpp
+++ b/src/kitemviews/private/kitemlistroleeditor.cpp
@@ -8,16 +8,17 @@
 
 #include <KIO/Global>
 
-KItemListRoleEditor::KItemListRoleEditor(QWidget *parent) :
-    KTextEdit(parent),
-    m_role(),
-    m_blockFinishedSignal(false)
+KItemListRoleEditor::KItemListRoleEditor(QWidget *parent)
+    : KTextEdit(parent)
+    , m_role()
+    , m_blockFinishedSignal(false)
 {
     setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
     setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
     setAcceptRichText(false);
     enableFindReplace(false);
     document()->setDocumentMargin(0);
+    setCheckSpellingEnabled(false);
 
     if (parent) {
         parent->installEventFilter(this);
@@ -30,7 +31,7 @@ KItemListRoleEditor::~KItemListRoleEditor()
 {
 }
 
-void KItemListRoleEditor::setRole(const QByteArray& role)
+void KItemListRoleEditor::setRole(const QByteArray &role)
 {
     m_role = role;
 }
@@ -45,7 +46,7 @@ void KItemListRoleEditor::setAllowUpDownKeyChainEdit(bool allowChainEdit)
     m_allowUpDownKeyChainEdit = allowChainEdit;
 }
 
-bool KItemListRoleEditor::eventFilter(QObject* watched, QEvent* event)
+bool KItemListRoleEditor::eventFilter(QObject *watched, QEvent *event)
 {
     if (watched == parentWidget() && event->type() == QEvent::Resize) {
         emitRoleEditingFinished();
@@ -54,10 +55,10 @@ bool KItemListRoleEditor::eventFilter(QObject* watched, QEvent* event)
     return KTextEdit::eventFilter(watched, event);
 }
 
-bool KItemListRoleEditor::event(QEvent* event)
+bool KItemListRoleEditor::event(QEvent *event)
 {
     if (event->type() == QEvent::FocusOut) {
-        QFocusEvent* focusEvent = static_cast<QFocusEvent*>(event);
+        QFocusEvent *focusEvent = static_cast<QFocusEvent *>(event);
         if (focusEvent->reason() != Qt::PopupFocusReason) {
             emitRoleEditingFinished();
         }
@@ -65,7 +66,7 @@ bool KItemListRoleEditor::event(QEvent* event)
     return KTextEdit::event(event);
 }
 
-void KItemListRoleEditor::keyPressEvent(QKeyEvent* event)
+void KItemListRoleEditor::keyPressEvent(QKeyEvent *event)
 {
     switch (event->key()) {
     case Qt::Key_Escape:
@@ -90,6 +91,7 @@ void KItemListRoleEditor::keyPressEvent(QKeyEvent* event)
             event->accept();
             return;
         }
+        break;
     case Qt::Key_Backtab:
     case Qt::Key_Up:
         if (m_allowUpDownKeyChainEdit || event->key() == Qt::Key_Backtab) {
@@ -97,6 +99,7 @@ void KItemListRoleEditor::keyPressEvent(QKeyEvent* event)
             event->accept();
             return;
         }
+        break;
     case Qt::Key_Left:
     case Qt::Key_Right: {
         QTextCursor cursor = textCursor();
@@ -116,12 +119,8 @@ void KItemListRoleEditor::keyPressEvent(QKeyEvent* event)
     case Qt::Key_Home:
     case Qt::Key_End: {
         if (event->modifiers() == Qt::NoModifier || event->modifiers() == Qt::ShiftModifier) {
-            const QTextCursor::MoveOperation op = event->key() == Qt::Key_Home
-                                                ? QTextCursor::Start
-                                                : QTextCursor::End;
-            const QTextCursor::MoveMode mode = event->modifiers() == Qt::NoModifier
-                                             ? QTextCursor::MoveAnchor
-                                             : QTextCursor::KeepAnchor;
+            const QTextCursor::MoveOperation op = event->key() == Qt::Key_Home ? QTextCursor::Start : QTextCursor::End;
+            const QTextCursor::MoveMode mode = event->modifiers() == Qt::NoModifier ? QTextCursor::MoveAnchor : QTextCursor::KeepAnchor;
             QTextCursor cursor = textCursor();
             cursor.movePosition(op, mode);
             setTextCursor(cursor);
@@ -141,6 +140,10 @@ void KItemListRoleEditor::autoAdjustSize()
 {
     const qreal frameBorder = 2 * frameWidth();
 
+    const auto originalSize = size();
+    auto newSize = originalSize;
+
+    document()->adjustSize();
     const qreal requiredWidth = document()->size().width();
     const qreal availableWidth = size().width() - frameBorder;
     if (requiredWidth > availableWidth) {
@@ -148,7 +151,7 @@ void KItemListRoleEditor::autoAdjustSize()
         if (parentWidget() && pos().x() + newWidth > parentWidget()->width()) {
             newWidth = parentWidget()->width() - pos().x();
         }
-        resize(newWidth, size().height());
+        newSize.setWidth(newWidth);
     }
 
     const qreal requiredHeight = document()->size().height();
@@ -158,17 +161,25 @@ void KItemListRoleEditor::autoAdjustSize()
         if (parentWidget() && pos().y() + newHeight > parentWidget()->height()) {
             newHeight = parentWidget()->height() - pos().y();
         }
-        resize(size().width(), newHeight);
+        newSize.setHeight(newHeight);
+    }
+
+    if (originalSize != newSize) {
+        resize(newSize);
     }
+    // reset the document width to the widget width
+    // to allow alignment to be properly rendered
+    document()->setTextWidth(newSize.width());
 }
 
 void KItemListRoleEditor::emitRoleEditingFinished(EditResultDirection direction)
 {
     QVariant ret;
-    ret.setValue(EditResult {KIO::encodeFileName(toPlainText()), direction});
+    ret.setValue(EditResult{KIO::encodeFileName(toPlainText()), direction});
 
     if (!m_blockFinishedSignal) {
         Q_EMIT roleEditingFinished(m_role, ret);
     }
 }
 
+#include "moc_kitemlistroleeditor.cpp"