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

QmlJS: Fix focus handling in QML/JS console

Browse Source 
We want the line editor to be focused by default when the console is
opened either by mouse or by keyboard interaction.

Change-Id: Ic366d1ac5f1306c0739c334584568402969895f3
Task-number: QTCREATORBUG-14931
Reviewed-by: hjk <hjk@theqtcompany.com>
This commit is contained in:
Ulf Hermann
2015-10-28 13:32:53 +01:00
parent d8d7acbe75
commit 19ab78865c
3 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/qmljstools/qmlconsolepane.cpp
View File

@@ -195,12 +195,17 @@ bool QmlConsolePane::canFocus() const
bool QmlConsolePane::hasFocus() const
{
return m_consoleWidget->window()->focusWidget() == m_consoleWidget;
for (QWidget *widget = m_consoleWidget->window()->focusWidget(); widget != 0;
widget = widget->parentWidget()) {
if (widget == m_consoleWidget)
return true;
}
return false;
}
void QmlConsolePane::setFocus()
{
m_consoleWidget->setFocus();
m_consoleView->setFocus();
}
bool QmlConsolePane::canNext() const