Workaround QCompleter issue with closing its popup on escape

QCompleter doesn't close its popup if there's a application wide
'escape' shortcut.
This commit adds the necessary shortcut overrides for CompletingTextEdit
and FancyLineEdit, which fixes the issue at least for find tool bar,
advanced search, gerrit dialog and description field of submit editor.

Task-number: QTCREATORBUG-9453
Change-Id: Ib1df218ab6b9a54fbf19d6132c6edd8e83ace46c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
Eike Ziller
2013-06-25 18:48:43 +02:00
parent 1fd1bf981e
commit 0855d4acfa
4 changed files with 41 additions and 4 deletions

View File

@@ -190,6 +190,20 @@ void CompletingTextEdit::focusInEvent(QFocusEvent *e)
QTextEdit::focusInEvent(e);
}
bool CompletingTextEdit::event(QEvent *e)
{
// workaround for QTCREATORBUG-9453
if (e->type() == QEvent::ShortcutOverride && completer()
&& completer()->popup() && completer()->popup()->isVisible()) {
QKeyEvent *ke = static_cast<QKeyEvent *>(e);
if (ke->key() == Qt::Key_Escape && !ke->modifiers()) {
ke->accept();
return true;
}
}
return QTextEdit::event(e);
}
} // namespace Utils
#include "moc_completingtextedit.cpp"

View File

@@ -36,6 +36,7 @@
QT_BEGIN_NAMESPACE
class QCompleter;
class QEvent;
QT_END_NAMESPACE
namespace Utils {
@@ -59,6 +60,7 @@ public:
protected:
void keyPressEvent(QKeyEvent *e);
void focusInEvent(QFocusEvent *e);
bool event(QEvent *e);
private:
class CompletingTextEditPrivate *d;

View File

@@ -31,13 +31,15 @@
#include "historycompleter.h"
#include "qtcassert.h"
#include <QDebug>
#include <QPropertyAnimation>
#include <QAbstractItemView>
#include <QApplication>
#include <QDebug>
#include <QDesktopWidget>
#include <QKeyEvent>
#include <QMenu>
#include <QPainter>
#include <QPropertyAnimation>
#include <QStyle>
#include <QDesktopWidget>
/*! Opens a menu at the specified widget position.
* This functions computes the position where to show the menu, and opens it with
@@ -251,6 +253,20 @@ void FancyLineEdit::resizeEvent(QResizeEvent *)
updateButtonPositions();
}
bool FancyLineEdit::event(QEvent *e)
{
// workaround for QTCREATORBUG-9453
if (e->type() == QEvent::ShortcutOverride && completer()
&& completer()->popup() && completer()->popup()->isVisible()) {
QKeyEvent *ke = static_cast<QKeyEvent *>(e);
if (ke->key() == Qt::Key_Escape && !ke->modifiers()) {
ke->accept();
return true;
}
}
return QLineEdit::event(e);
}
void FancyLineEdit::setButtonPixmap(Side side, const QPixmap &buttonPixmap)
{
d->m_iconbutton[side]->setPixmap(buttonPixmap);

View File

@@ -35,6 +35,10 @@
#include <QLineEdit>
#include <QAbstractButton>
QT_BEGIN_NAMESPACE
class QEvent;
QT_END_NAMESPACE
namespace Utils {
class FancyLineEditPrivate;
@@ -109,7 +113,8 @@ private slots:
void iconClicked();
protected:
virtual void resizeEvent(QResizeEvent *e);
void resizeEvent(QResizeEvent *e);
bool event(QEvent *e);
private:
// Unimplemented, to force the user to make a decision on