mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix the inconsistent behaviour of QCompleter

Browse source 
The TagWidget behaves now similiar to a QLineEdit.
Pressing Enter/Return will now close the completion widget.

Signed-off-by: Maximilian Güntner <maximilian.guentner@gmail.com>
This commit is contained in:
Maximilian Güntner 2013-11-02 17:04:18 +01:00
parent 2967391ffe
commit c4d8b6a4d5
2 changed files with 35 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

34
qt-ui/tagwidget.cpp
View file

@ -1,10 +1,12 @@
#include "tagwidget.h" #include "tagwidget.h"
#include <QPair> #include <QPair>
#include <QDebug> #include <QDebug>
#include <QAbstractItemView>
TagWidget::TagWidget(QWidget *parent) : GroupedLineEdit(parent), m_completer(NULL) TagWidget::TagWidget(QWidget *parent) : GroupedLineEdit(parent), m_completer(NULL)
{ {
connect(this, SIGNAL(cursorPositionChanged()), this, SLOT(reparse())); connect(this, SIGNAL(cursorPositionChanged()), this, SLOT(reparse()));
connect(this, SIGNAL(textChanged()), this, SLOT(reparse()));
addColor(QColor(0x00, 0xAE, 0xFF)); addColor(QColor(0x00, 0xAE, 0xFF));
addColor(QColor(0x00, 0x78, 0xB0)); addColor(QColor(0x00, 0x78, 0xB0));
@ -15,6 +17,7 @@ void TagWidget::setCompleter(QCompleter *completer)
m_completer = completer; m_completer = completer;
m_completer->setWidget(this); m_completer->setWidget(this);
connect(m_completer, SIGNAL(activated(QString)), this, SLOT(completionSelected(QString))); connect(m_completer, SIGNAL(activated(QString)), this, SLOT(completionSelected(QString)));
connect(m_completer, SIGNAL(highlighted(QString)), this, SLOT(completionSelected(QString)));
} }
QPair<int,int> TagWidget::getCursorTagPosition() { QPair<int,int> TagWidget::getCursorTagPosition() {
@ -98,7 +101,18 @@ void TagWidget::reparse()
currentText = ""; currentText = "";
if (m_completer) { if (m_completer) {
m_completer->setCompletionPrefix(currentText); m_completer->setCompletionPrefix(currentText);
m_completer->complete(); if (m_completer->completionCount() == 1) {
if (m_completer->currentCompletion() == currentText) {
QAbstractItemView *popup = m_completer->popup();
if (popup)
popup->hide();
}
else
m_completer->complete();
} else {
m_completer->complete();
}
} }
} }
@ -133,3 +147,21 @@ void TagWidget::clear() {
GroupedLineEdit::clear(); GroupedLineEdit::clear();
blockSignals(false); blockSignals(false);
} }
void TagWidget::keyPressEvent(QKeyEvent *e) {
switch (e->key()) {
case Qt::Key_Return:
case Qt::Key_Enter:
/*
* Fake the QLineEdit behaviour by simply
* closing the QAbstractViewitem
*/
if (m_completer) {
QAbstractItemView *popup = m_completer->popup();
if (popup)
popup->hide();
}
}
GroupedLineEdit::keyPressEvent(e);
}

2
qt-ui/tagwidget.h
View file

@ -19,6 +19,8 @@ public:
public slots: public slots:
void reparse(); void reparse();
void completionSelected(QString); void completionSelected(QString);
protected:
void keyPressEvent(QKeyEvent *e);
private: private:
QCompleter *m_completer; QCompleter *m_completer;
}; };