From: Bernhard Scheirle <bernhard+git@scheirle.de>
Date: Fri, 19 Aug 2016 06:15:03 +0000 (+0200)
Subject: Prevent the spelling highlighter from disabling itself
X-Git-Tag: travis-deploy-test~374
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=97e06500c62eccc20c50d10e6ed09bc3fcebcde4

Prevent the spelling highlighter from disabling itself

Resolves GH-241.
---

diff --git a/src/qtui/inputwidget.cpp b/src/qtui/inputwidget.cpp
index d95f01a3..a664b6af 100644
--- a/src/qtui/inputwidget.cpp
+++ b/src/qtui/inputwidget.cpp
@@ -504,12 +504,6 @@ void InputWidget::onTextEntered(const QString &text)
     fmt.clearForeground();
     fmt.clearBackground();
     inputLine()->setCurrentCharFormat(fmt);
-
-#ifdef HAVE_KDE
-    // Set highlighter back to active in case it was deactivated by too many errors.
-    if (ui.inputEdit->highlighter())
-        ui.inputEdit->highlighter()->setActive(true);
-#endif
 }
 
 
diff --git a/src/uisupport/multilineedit.cpp b/src/uisupport/multilineedit.cpp
index 90eadaa7..5ace7d6d 100644
--- a/src/uisupport/multilineedit.cpp
+++ b/src/uisupport/multilineedit.cpp
@@ -90,6 +90,14 @@ MultiLineEdit::~MultiLineEdit()
 {
 }
 
+#if defined HAVE_KF5 || defined HAVE_KDE4
+void MultiLineEdit::createHighlighter()
+{
+    KTextEdit::createHighlighter();
+    if (highlighter())
+        highlighter()->setAutomatic(false);
+}
+#endif
 
 void MultiLineEdit::setCustomFont(const QFont &font)
 {
diff --git a/src/uisupport/multilineedit.h b/src/uisupport/multilineedit.h
index 6924fb23..e6b58e17 100644
--- a/src/uisupport/multilineedit.h
+++ b/src/uisupport/multilineedit.h
@@ -74,6 +74,9 @@ public:
     inline bool emacsMode() const { return _emacsMode; }
 
     void addCompletionSpace();
+#if defined HAVE_KF5 || defined HAVE_KDE4
+    virtual void createHighlighter() override;
+#endif
 
 public slots:
     void setMode(Mode mode);