feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix fix for focus handling when leaving locator

Browse Source 
If accepting a filter entry already changes the focus, then we should
not interfere by setting it somewhere else again.

Task-number: QTCREATORBUG-21125
Change-Id: I9ff76b0bae9280b44c73d7078f25ca42b6b89821
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Eike Ziller
2018-09-24 14:38:30 +02:00
parent 9da9ed45e9
commit ffad72c9ce
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/coreplugin/locator/locatorwidget.cpp
View File

@@ -886,10 +886,12 @@ void LocatorWidget::acceptEntry(int row)
QString newText; QString newText;
int selectionStart = -1; int selectionStart = -1;
int selectionLength = 0; int selectionLength = 0;
QWidget *focusBeforeAccept = QApplication::focusWidget();
entry.filter->accept(entry, &newText, &selectionStart, &selectionLength); entry.filter->accept(entry, &newText, &selectionStart, &selectionLength);
if (newText.isEmpty()) { if (newText.isEmpty()) {
emit hidePopup(); emit hidePopup();
resetFocus(m_previousFocusWidget, isInMainWindow()); if (QApplication::focusWidget() == focusBeforeAccept)
resetFocus(m_previousFocusWidget, isInMainWindow());
} else { } else {
showText(newText, selectionStart, selectionLength); showText(newText, selectionStart, selectionLength);
} }