diff options
| author | Eike Ziller <eike.ziller@nokia.com> | 2011-12-01 13:03:08 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@nokia.com> | 2011-12-02 12:34:39 +0100 |
| commit | 5f44d8f5354ff5b192f8cdf88a85a81a218f733c (patch) | |
| tree | a62c64698239dedb458516775e2877d1877b7724 /src/plugins/find | |
| parent | 67ab31c224d2c7628e5fdd19df77378af6d0b13a (diff) | |
| download | qt-creator-5f44d8f5354ff5b192f8cdf88a85a81a218f733c.tar.gz | |
More Esc fixes.
Move focus back to editor's focus widget if there's one.
(E.g. pressing escape in an output pane while the
commit editor is open.)
Change-Id: I4211a84cfa3d7ee9b61f39ae054fc4bd32e214c1
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Diffstat (limited to 'src/plugins/find')
| -rw-r--r-- | src/plugins/find/currentdocumentfind.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/plugins/find/currentdocumentfind.cpp b/src/plugins/find/currentdocumentfind.cpp index acbed55a96..6f4175416c 100644 --- a/src/plugins/find/currentdocumentfind.cpp +++ b/src/plugins/find/currentdocumentfind.cpp @@ -221,7 +221,10 @@ void CurrentDocumentFind::clearFindSupport() bool CurrentDocumentFind::setFocusToCurrentFindSupport() { if (m_currentFind && m_currentWidget) { - m_currentWidget->setFocus(); + QWidget *w = m_currentWidget->focusWidget(); + if (!w) + w = m_currentWidget; + w->setFocus(); return true; } return false; |