X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Ftabcompleter.cpp;h=5cc80c9d8692a8d5a75588a44498ec6f52b68aae;hp=9a8341697e7c7adab553d5a8d2b1fb344d6f3acf;hb=ba5a098f200be1968d198b1325c45b943c797a3b;hpb=84cd3561e97167ffb98ecab0fd2b884ba1d13ada

diff --git a/src/uisupport/tabcompleter.cpp b/src/uisupport/tabcompleter.cpp
index 9a834169..5cc80c9d 100644
--- a/src/uisupport/tabcompleter.cpp
+++ b/src/uisupport/tabcompleter.cpp
@@ -45,18 +45,19 @@ TabCompleter::TabCompleter(MultiLineEdit *_lineEdit)
     _enabled(false),
     _nickSuffix(": ")
 {
-    // use both an Action and generic eventFilter, to make the shortcut configurable
-    // yet still be able to reset() when required
+    // This Action just serves as a container for the custom shortcut and isn't actually handled;
+    // apparently, using tab as an Action shortcut  in an input widget is unreliable on some platforms (e.g. OS/2)
     _lineEdit->installEventFilter(this);
     ActionCollection *coll = GraphicalUi::actionCollection("General");
-    coll->addAction("TabCompletionKey", new Action(tr("Tab completion"), coll,
+    QAction *a = coll->addAction("TabCompletionKey", new Action(tr("Tab completion"), coll,
             this, SLOT(onTabCompletionKey()), QKeySequence(Qt::Key_Tab)));
+    a->setEnabled(false); // avoid catching the shortcut
 }
 
 
 void TabCompleter::onTabCompletionKey()
 {
-    complete();
+    // do nothing; we use the event filter instead
 }
 
 
@@ -179,9 +180,11 @@ bool TabCompleter::eventFilter(QObject *obj, QEvent *event)
 
     QKeyEvent *keyEvent = static_cast<QKeyEvent *>(event);
 
-    if (keyEvent->key() != GraphicalUi::actionCollection("General")->action("TabCompletionKey")->shortcut()[0]) {
+    if (keyEvent->key() == GraphicalUi::actionCollection("General")->action("TabCompletionKey")->shortcut()[0])
+        complete();
+    else
         reset();
-    }
+
     return false;
 }