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

Fix escape handling in find tool bar.

Browse Source 
It was explicitly handling the escape key for "return to current
document find", which is wrong since the shortcut for "return to editor"
(which it replaces) can be changed.
The correct thing is to register an own action for "return to editor"
for the find tool bar, overriding the default behavior.

Change-Id: I77c690fa5921ce4022b8d2b38383668efd717875
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
Eike Ziller
2014-03-03 11:55:50 +01:00
parent 23e6a0ac09
commit 9ac55e5b2c
4 changed files with 19 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/coreplugin/find/findplugin.cpp
View File

@@ -129,6 +129,11 @@ void FindPlugin::initialize(const QStringList &, QString *)
d->m_currentDocumentFind = new Internal::CurrentDocumentFind;
d->m_findToolBar = new Internal::FindToolBar(this, d->m_currentDocumentFind);
auto *findToolBarContext = new IContext(this);
findToolBarContext->setWidget(d->m_findToolBar);
findToolBarContext->setContext(Context(Constants::C_FINDTOOLBAR));
ICore::addContextObject(findToolBarContext);
d->m_findDialog = new Internal::FindToolWindow(this);
d->m_searchResultWindow = new SearchResultWindow(d->m_findDialog);
ExtensionSystem::PluginManager::addObject(d->m_searchResultWindow);