From dddb965f83d4a2f69920618e79596a0d14e7df8c Mon Sep 17 00:00:00 2001
From: con <qtc-committer@nokia.com>
Date: Wed, 3 Jun 2009 15:31:30 +0200
Subject: [PATCH] Locator text was no longer selected when using shortcut.
Reviewed-by: dt <qtc-committer@nokia.com>
---
src/plugins/quickopen/quickopentoolwindow.cpp | 11 ++---------
src/plugins/quickopen/quickopentoolwindow.h | 1 -
2 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/src/plugins/quickopen/quickopentoolwindow.cpp b/src/plugins/quickopen/quickopentoolwindow.cpp
index 139559bee34..f6d9ae1a903 100644
--- a/src/plugins/quickopen/quickopentoolwindow.cpp
+++ b/src/plugins/quickopen/quickopentoolwindow.cpp
@@ -345,6 +345,8 @@ bool QuickOpenToolWindow::eventFilter(QObject *obj, QEvent *event)
} else if (obj == m_fileLineEdit && event->type() == QEvent::FocusOut) {
m_completionList->hide();
} else if (obj == m_fileLineEdit && event->type() == QEvent::FocusIn) {
+ if (static_cast<QFocusEvent*>(event)->reason() != Qt::MouseFocusReason)
+ m_fileLineEdit->selectAll();
updateCompletionList(m_fileLineEdit->typedText());
showCompletionList();
} else if (obj == this && event->type() == QEvent::ShortcutOverride) {
@@ -470,15 +472,6 @@ void QuickOpenToolWindow::filterSelected()
m_fileLineEdit->setFocus();
}
-void QuickOpenToolWindow::focusInEvent(QFocusEvent *e)
-{
- m_fileLineEdit->setFocus(e->reason());
- if (e->reason() != Qt::MouseFocusReason) {
- m_fileLineEdit->selectAll();
- }
- QWidget::focusInEvent(e);
-}
-
void QuickOpenToolWindow::showEvent(QShowEvent *event)
{
QWidget::showEvent(event);
diff --git a/src/plugins/quickopen/quickopentoolwindow.h b/src/plugins/quickopen/quickopentoolwindow.h
index aa898fd5eea..50b5b920f06 100644
--- a/src/plugins/quickopen/quickopentoolwindow.h
+++ b/src/plugins/quickopen/quickopentoolwindow.h
@@ -76,7 +76,6 @@ private:
bool eventFilter(QObject *obj, QEvent *event);
void showEvent(QShowEvent *e);
- void focusInEvent(QFocusEvent *e);
bool isShowingTypeHereMessage() const;
void showCompletionList();
--
GitLab