Skip to content

Update Qt Advanced Docking System #737

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

Merged
dail8859 merged 3 commits into from
Apr 2, 2025
Merged

Update Qt Advanced Docking System #737

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9bcf87f
Update ADS to latest version
dail8859 Mar 20, 2025
b6b59c9
Keep track of latest DockArea
dail8859 Mar 25, 2025
ff58b99
Fix ADS deprecation message
dail8859 Mar 25, 2025
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
13 changes: 3 additions & 10 deletions src/NotepadNext/DockedEditor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,14 +146,7 @@ void DockedEditor::dockWidgetCloseRequested()

ads::CDockAreaWidget *DockedEditor::currentDockArea() const
{
const ads::CDockWidget *dockWidget = dockManager->focusedDockWidget();

if (dockWidget) {
return dockWidget->dockAreaWidget();
}
else {
return Q_NULLPTR;
}
return dockManager->focusedDockWidget() ? dockManager->focusedDockWidget()->dockAreaWidget() : latestDockArea;
}

void DockedEditor::addEditor(ScintillaNext *editor)
Expand All @@ -167,7 +160,7 @@ void DockedEditor::addEditor(ScintillaNext *editor)
}

// Create the dock widget for the editor
ads::CDockWidget *dockWidget = new ads::CDockWidget(editor->getName());
ads::CDockWidget *dockWidget = dockManager->createDockWidget(editor->getName());

// Disable elide, elided file names not readable when lots of files opened
dockWidget->tabWidget()->setElideMode(Qt::ElideNone);
Expand Down Expand Up @@ -215,7 +208,7 @@ void DockedEditor::addEditor(ScintillaNext *editor)

connect(dockWidget, &ads::CDockWidget::closeRequested, this, &DockedEditor::dockWidgetCloseRequested);

dockManager->addDockWidget(ads::CenterDockWidgetArea, dockWidget, currentDockArea());
latestDockArea = dockManager->addDockWidget(ads::CenterDockWidgetArea, dockWidget, currentDockArea());

emit editorAdded(editor);
}
Expand Down
1 change: 1 addition & 0 deletions src/NotepadNext/DockedEditor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ class DockedEditor : public QObject

private:
ads::CDockManager* dockManager = Q_NULLPTR;
ads::CDockAreaWidget* latestDockArea = Q_NULLPTR;
ScintillaNext *currentEditor = Q_NULLPTR;

public:
Expand Down
2 changes: 1 addition & 1 deletion src/ads
Open in desktop
Submodule ads updated 55 files
+1 −1 .github/workflows/linux-builds.yml
+1 −1 .gitignore
+2 −2 CMakeLists.txt
+31 −10 README.md
+2 −2 demo/CMakeLists.txt
+21 −19 demo/MainWindow.cpp
+58 −0 demo/MyDockAreaTitleBar.h
+ − doc/cfg_flag_AutoHideOpenOnDragHover.gif
+ − doc/showcase_dream3d_nx.png
+126 −15 doc/user-guide.md
+3 −2 examples/CMakeLists.txt
+2 −2 examples/autohide/CMakeLists.txt
+29 −0 examples/autohidedragndrop/CMakeLists.txt
+36 −0 examples/autohidedragndrop/autohidedragndrop.pro
+38 −0 examples/autohidedragndrop/droppableitem.cpp
+19 −0 examples/autohidedragndrop/droppableitem.h
+10 −0 examples/autohidedragndrop/main.cpp
+84 −0 examples/autohidedragndrop/main.py
+131 −0 examples/autohidedragndrop/mainwindow.cpp
+43 −0 examples/autohidedragndrop/mainwindow.h
+47 −0 examples/autohidedragndrop/mainwindow.ui
+2 −2 examples/centralwidget/CMakeLists.txt
+2 −2 examples/configflags/CMakeLists.txt
+2 −2 examples/deleteonclose/CMakeLists.txt
+2 −2 examples/dockindock/CMakeLists.txt
+2 −2 examples/emptydockarea/CMakeLists.txt
+11 −3 examples/emptydockarea/mainwindow.cpp
+1 −0 examples/examples.pro
+2 −2 examples/hideshow/CMakeLists.txt
+2 −2 examples/sidebar/CMakeLists.txt
+2 −2 examples/simple/CMakeLists.txt
+30 −4 src/AutoHideDockContainer.cpp
+2 −1 src/AutoHideDockContainer.h
+95 −35 src/AutoHideTab.cpp
+4 −1 src/AutoHideTab.h
+2 −2 src/CMakeLists.txt
+8 −32 src/DockAreaTabBar.cpp
+1 −2 src/DockAreaTabBar.h
+40 −14 src/DockAreaTitleBar.cpp
+14 −0 src/DockAreaTitleBar.h
+27 −7 src/DockAreaWidget.cpp
+1 −0 src/DockAreaWidget.h
+9 −3 src/DockComponentsFactory.cpp
+4 −11 src/DockComponentsFactory.h
+7 −0 src/DockFocusController.cpp
+6 −0 src/DockFocusController.h
+77 −6 src/DockManager.cpp
+66 −1 src/DockManager.h
+21 −4 src/DockWidget.cpp
+28 −1 src/DockWidget.h
+21 −14 src/DockWidgetTab.cpp
+16 −0 src/DockWidgetTab.h
+10 −10 src/FloatingDockContainer.h
+1 −1 src/ads_globals.cpp
+1 −1 src/ads_globals.h