forked from qt-creator/qt-creator
db358f9ebc
Before, we jumped to a symbol as soon as the selection changed, which was problematic: * It was inconsistent to other outlines (e.g. class view, project explorer) * Using the Up/Down keys in the sidebar immediately jumped to the symbol in the editor, thus polluting the editor history. Now we jump to a symbol if the corresponding item was explicitly activated (QAbstractItemView::activated() signal). There was also another strange issue: If "Synchronize with Editor" was de-activated, nothing happened upon activation/selection of an item. Now "Synchronize with Editor" means to update the selection in the side bar if the cursor position changes in the editor (one direction only). Task-number: QTCREATORBUG-12412 Change-Id: I8d9191d5fa8e229723194dcf30081e144debecbb Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
108 lines
3.2 KiB
C++
108 lines
3.2 KiB
C++
/****************************************************************************
|
|
**
|
|
** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
|
|
** Contact: http://www.qt-project.org/legal
|
|
**
|
|
** This file is part of Qt Creator.
|
|
**
|
|
** Commercial License Usage
|
|
** Licensees holding valid commercial Qt licenses may use this file in
|
|
** accordance with the commercial license agreement provided with the
|
|
** Software or, alternatively, in accordance with the terms contained in
|
|
** a written agreement between you and Digia. For licensing terms and
|
|
** conditions see http://qt.digia.com/licensing. For further information
|
|
** use the contact form at http://qt.digia.com/contact-us.
|
|
**
|
|
** GNU Lesser General Public License Usage
|
|
** Alternatively, this file may be used under the terms of the GNU Lesser
|
|
** General Public License version 2.1 as published by the Free Software
|
|
** Foundation and appearing in the file LICENSE.LGPL included in the
|
|
** packaging of this file. Please review the following information to
|
|
** ensure the GNU Lesser General Public License version 2.1 requirements
|
|
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
|
**
|
|
** In addition, as a special exception, Digia gives you certain additional
|
|
** rights. These rights are described in the Digia Qt LGPL Exception
|
|
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
|
**
|
|
****************************************************************************/
|
|
|
|
#ifndef CPPOUTLINE_H
|
|
#define CPPOUTLINE_H
|
|
|
|
#include "cppeditor.h"
|
|
|
|
#include <texteditor/ioutlinewidget.h>
|
|
|
|
#include <utils/navigationtreeview.h>
|
|
|
|
#include <QSortFilterProxyModel>
|
|
|
|
namespace CPlusPlus { class OverviewModel; }
|
|
|
|
namespace CppEditor {
|
|
namespace Internal {
|
|
|
|
class CppOutlineTreeView : public Utils::NavigationTreeView
|
|
{
|
|
Q_OBJECT
|
|
public:
|
|
CppOutlineTreeView(QWidget *parent);
|
|
|
|
void contextMenuEvent(QContextMenuEvent *event);
|
|
};
|
|
|
|
class CppOutlineFilterModel : public QSortFilterProxyModel
|
|
{
|
|
Q_OBJECT
|
|
public:
|
|
CppOutlineFilterModel(CPlusPlus::OverviewModel *sourceModel, QObject *parent);
|
|
// QSortFilterProxyModel
|
|
bool filterAcceptsRow(int sourceRow,
|
|
const QModelIndex &sourceParent) const;
|
|
private:
|
|
CPlusPlus::OverviewModel *m_sourceModel;
|
|
};
|
|
|
|
class CppOutlineWidget : public TextEditor::IOutlineWidget
|
|
{
|
|
Q_OBJECT
|
|
public:
|
|
CppOutlineWidget(CPPEditorWidget *editor);
|
|
|
|
// IOutlineWidget
|
|
virtual QList<QAction*> filterMenuActions() const;
|
|
virtual void setCursorSynchronization(bool syncWithCursor);
|
|
|
|
private slots:
|
|
void modelUpdated();
|
|
void updateSelectionInTree(const QModelIndex &index);
|
|
void updateTextCursor(const QModelIndex &index);
|
|
void onItemActivated(const QModelIndex &index);
|
|
|
|
private:
|
|
bool syncCursor();
|
|
|
|
private:
|
|
CPPEditorWidget *m_editor;
|
|
CppOutlineTreeView *m_treeView;
|
|
CPlusPlus::OverviewModel *m_model;
|
|
CppOutlineFilterModel *m_proxyModel;
|
|
|
|
bool m_enableCursorSync;
|
|
bool m_blockCursorSync;
|
|
};
|
|
|
|
class CppOutlineWidgetFactory : public TextEditor::IOutlineWidgetFactory
|
|
{
|
|
Q_OBJECT
|
|
public:
|
|
bool supportsEditor(Core::IEditor *editor) const;
|
|
TextEditor::IOutlineWidget *createWidget(Core::IEditor *editor);
|
|
};
|
|
|
|
} // namespace Internal
|
|
} // namespace CppEditor
|
|
|
|
#endif // CPPOUTLINE_H
|