Skip to content

support function list #1136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
MeiyongYu wants to merge 1 commit into from
+1,914 −10
Closed

support function list #1136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,12 @@ qt_add_executable(NotepadNext
widgets/QuickFindWidget.cpp
widgets/QuickFindWidget.h
widgets/QuickFindWidget.ui
widgets/FunctionListWidget.cpp
widgets/FunctionListWidget.h
widgets/CtagsSymbolManager.cpp
widgets/CtagsSymbolManager.h
widgets/EditorPane.cpp
widgets/EditorPane.h
widgets/StatusLabel.cpp
widgets/StatusLabel.h
Sorter.h Sorter.cpp
Expand Down
34 changes: 26 additions & 8 deletions src/DockedEditor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
#include "DockAreaTitleBar.h"

#include "ScintillaNext.h"
#include "EditorPane.h"

#include <QUuid>

Expand Down Expand Up @@ -70,7 +71,7 @@ DockedEditor::DockedEditor(QWidget *parent) : QObject(parent)
connect(dockManager, &ads::CDockManager::focusedDockWidgetChanged, this, [=, this](ads::CDockWidget* old, ads::CDockWidget* now) {
Q_UNUSED(old)

ScintillaNext *editor = qobject_cast<ScintillaNext *>(now->widget());
ScintillaNext *editor = EditorPane::editorFromWidget(now->widget());

currentEditor = editor;
editor->grabFocus();
Expand All @@ -96,6 +97,19 @@ DockedEditor::DockedEditor(QWidget *parent) : QObject(parent)
}


ads::CDockWidget *DockedEditor::dockWidgetForEditor(const ScintillaNext *editor)
{
if (editor == Q_NULLPTR)
return Q_NULLPTR;

QWidget *w = const_cast<ScintillaNext *>(editor)->parentWidget();
// The editor may be wrapped inside an EditorPane (function list splitter)
if (qobject_cast<EditorPane *>(w) != Q_NULLPTR)
w = w->parentWidget();
return qobject_cast<ads::CDockWidget *>(w);
}


ScintillaNext *DockedEditor::getCurrentEditor() const
{
return currentEditor;
Expand All @@ -118,7 +132,7 @@ QVector<ScintillaNext *> DockedEditor::editors() const
// For each area, for each widget, append it to our list
for (const ads::CDockAreaWidget* areaWidget : dockManager->openedDockAreas()) {
for (const ads::CDockWidget* dockWidget : areaWidget->dockWidgets()) {
editors.append(qobject_cast<ScintillaNext *>(dockWidget->widget()));
editors.append(EditorPane::editorFromWidget(dockWidget->widget()));
}
}

Expand All @@ -127,7 +141,7 @@ QVector<ScintillaNext *> DockedEditor::editors() const

void DockedEditor::switchToEditor(const ScintillaNext *editor)
{
ads::CDockWidget *dockWidget = qobject_cast<ads::CDockWidget *>(editor->parentWidget());
ads::CDockWidget *dockWidget = dockWidgetForEditor(editor);

if (dockWidget == Q_NULLPTR) {
qWarning() << "Expected editor's parent to be CDockWidget";
Expand All @@ -140,7 +154,7 @@ void DockedEditor::switchToEditor(const ScintillaNext *editor)
void DockedEditor::dockWidgetCloseRequested()
{
ads::CDockWidget *dockWidget = qobject_cast<ads::CDockWidget *>(sender());
ScintillaNext *editor = qobject_cast<ScintillaNext *>(dockWidget->widget());
ScintillaNext *editor = EditorPane::editorFromWidget(dockWidget->widget());

emit editorCloseRequested(editor);
}
Expand Down Expand Up @@ -169,7 +183,11 @@ void DockedEditor::addEditor(ScintillaNext *editor)
// We need a unique object name. Can't use the name or file path so use a uuid
dockWidget->setObjectName(QUuid::createUuid().toString());

dockWidget->setWidget(editor);
// Wrap the editor together with a function list panel. The panel is
// hidden by default; the dock widget content is the pane itself so the
// function list can never overlap other docks such as Folder as Workspace.
EditorPane *pane = new EditorPane(editor);
dockWidget->setWidget(pane);
dockWidget->setFeature(ads::CDockWidget::DockWidgetFeature::DockWidgetDeleteOnClose, true);
dockWidget->setFeature(ads::CDockWidget::DockWidgetFeature::CustomCloseHandling, true);
dockWidget->setFeature(ads::CDockWidget::DockWidgetFeature::DockWidgetFloatable, false);
Expand Down Expand Up @@ -218,7 +236,7 @@ void DockedEditor::editorRenamed(ScintillaNext *editor)
{
Q_ASSERT(editor != Q_NULLPTR);

ads::CDockWidget *dockWidget = qobject_cast<ads::CDockWidget *>(editor->parentWidget());
ads::CDockWidget *dockWidget = dockWidgetForEditor(editor);

dockWidget->setWindowTitle(editor->getName());

Expand All @@ -234,7 +252,7 @@ void DockedEditor::splitToRight(ScintillaNext *editor)
{
Q_ASSERT(editor != Q_NULLPTR);

ads::CDockWidget *newDockWidget = qobject_cast<ads::CDockWidget *>(editor->parentWidget());
ads::CDockWidget *newDockWidget = dockWidgetForEditor(editor);
if (newDockWidget) {
ads::CDockAreaWidget *currentArea = currentDockArea();
if (currentArea) {
Expand All @@ -247,7 +265,7 @@ void DockedEditor::splitToBottom(ScintillaNext *editor)
{
Q_ASSERT(editor != Q_NULLPTR);

ads::CDockWidget *newDockWidget = qobject_cast<ads::CDockWidget *>(editor->parentWidget());
ads::CDockWidget *newDockWidget = dockWidgetForEditor(editor);
if (newDockWidget) {
ads::CDockAreaWidget *currentArea = currentDockArea();
if (currentArea) {
Expand Down
4 changes: 4 additions & 0 deletions src/DockedEditor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ class DockedEditor : public QObject
public:
explicit DockedEditor(QWidget *parent);

// Returns the dock widget hosting the editor (even when the editor is
// wrapped inside an EditorPane together with a function list)
static ads::CDockWidget *dockWidgetForEditor(const ScintillaNext *editor);

ScintillaNext *getCurrentEditor() const;
ads::CDockAreaWidget *currentDockArea() const;

Expand Down
Loading
Loading