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

OutlineViews: Make behavior consistent with other views

Browse Source 
Allow them to be focused, activate also on return/enter. Also fix focus
handling so that assigning a shortcut to "Activate Outline View"
actually
works.

Change-Id: I878777ae0dad493af1715b36ee264a4f0c12443e
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
Daniel Teske
2014-04-09 17:04:50 +02:00
parent 18f8486b05
commit aeabe1a727
6 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/qmljseditor/qmljsoutline.cpp
View File

@@ -104,6 +104,7 @@ QmlJSOutlineWidget::QmlJSOutlineWidget(QWidget *parent) :
m_filterModel->setFilterBindings(false);
m_treeView->setModel(m_filterModel);
setFocusProxy(m_treeView);
QVBoxLayout *layout = new QVBoxLayout;
@@ -130,8 +131,8 @@ void QmlJSOutlineWidget::setEditor(QmlJSTextEditorWidget *editor)
connect(m_treeView->selectionModel(), SIGNAL(selectionChanged(QItemSelection,QItemSelection)),
this, SLOT(updateSelectionInText(QItemSelection)));
connect(m_treeView, SIGNAL(doubleClicked(QModelIndex)),
this, SLOT(updateTextCursor(QModelIndex)));
connect(m_treeView, SIGNAL(activated(QModelIndex)),
this, SLOT(focusEditor()));
connect(m_editor, SIGNAL(outlineModelIndexChanged(QModelIndex)),
this, SLOT(updateSelectionInTree(QModelIndex)));
@@ -187,7 +188,7 @@ void QmlJSOutlineWidget::updateSelectionInTree(const QModelIndex &index)
filterIndex = m_filterModel->mapFromSource(baseIndex);
}
m_treeView->selectionModel()->select(filterIndex, QItemSelectionModel::ClearAndSelect);
m_treeView->setCurrentIndex(filterIndex);
m_treeView->scrollTo(filterIndex);
m_blockCursorSync = false;
}
@@ -226,10 +227,14 @@ void QmlJSOutlineWidget::updateTextCursor(const QModelIndex &index)
textCursor.setPosition(location.offset);
m_editor->setTextCursor(textCursor);
m_editor->centerCursor();
m_editor->setFocus();
m_blockCursorSync = false;
}
void QmlJSOutlineWidget::focusEditor()
{
m_editor->setFocus();
}
void QmlJSOutlineWidget::setShowBindings(bool showBindings)
{
m_filterModel->setFilterBindings(!showBindings);

1
src/plugins/qmljseditor/qmljsoutline.h
View File

@@ -80,6 +80,7 @@ private slots:
void updateSelectionInTree(const QModelIndex &index);
void updateSelectionInText(const QItemSelection &selection);
void updateTextCursor(const QModelIndex &index);
void focusEditor();
void setShowBindings(bool showBindings);
private:

2
src/plugins/qmljseditor/qmljsoutlinetreeview.cpp
View File

@@ -39,8 +39,6 @@ namespace Internal {
QmlJSOutlineTreeView::QmlJSOutlineTreeView(QWidget *parent) :
Utils::NavigationTreeView(parent)
{
// see also CppOutlineTreeView
setFocusPolicy(Qt::NoFocus);
setExpandsOnDoubleClick(false);
setDragEnabled(true);