mirrors/Qt-Advanced-Docking-System
1
0
Fork 0
mirror of https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System.git synced 2024-12-24 23:31:32 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix side tab widget ordering

Browse Source 
Now is fixed based on the side tab widget
This commit is contained in:
Syarif Fakhri 2022-09-14 17:39:57 +08:00
parent 06bcf2cd48
commit 4d3328e468
5 changed files with 49 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/DockContainerWidget.cpp
View File

@ -899,14 +899,19 @@ void DockContainerWidgetPrivate::saveChildNodesState(QXmlStreamWriter& s, QWidge
void DockContainerWidgetPrivate::saveOverlayWidgetsState(QXmlStreamWriter& Stream)
{
for (const auto dockAreaWidget : _this->findChildren<CDockAreaWidget*>())
for (const auto sideTabBar : SideTabBarWidgets.values())
{
if (!dockAreaWidget->isOverlayed())
{
continue;
}
for (auto itemIndex = 0; itemIndex < sideTabBar->tabCount(); itemIndex++)
{
const auto sideTab = sideTabBar->tabAt(itemIndex);
if (sideTab == nullptr)
{
continue;
}
dockAreaWidget->saveState(Stream);
const auto dockArea = sideTab->dockWidget()->dockAreaWidget();
dockArea->saveState(Stream);
}
}
}
@ -1096,7 +1101,7 @@ bool DockContainerWidgetPrivate::restoreOverlayDockArea(CDockingStateReader& s,
DockWidget->setClosedState(Closed);
DockWidget->setProperty(internal::ClosedProperty, Closed);
DockWidget->setProperty(internal::DirtyProperty, false);
_this->sideTabBar(area)->insertSideTab(0, DockWidget->sideTabWidget());
_this->sideTabBar(area)->insertSideTab(-1, DockWidget->sideTabWidget());
DockArea->overlayDockContainer()->addDockWidget(DockWidget);
DockWidget->sideTabWidget()->updateStyle(); // Needed as the side tab widget get it's left/right property from the overlay dock container which was just added
DockArea->overlayDockContainer()->toggleView(!Closed);

7
src/DockWidgetSideTab.cpp
View File

@ -314,6 +314,13 @@ void CDockWidgetSideTab::updateOrientationAndSpacing(SideTabBarArea area)
d->TitleLabel->show();
}
//============================================================================
CDockWidget* CDockWidgetSideTab::dockWidget() const
{
return d->DockWidget;
}
/**
* Private data class of SideTabIcon class (pimpl)
*/

6
src/DockWidgetSideTab.h
View File

@ -136,6 +136,12 @@ public:
*/
void updateOrientationAndSpacing(SideTabBarArea area);
/**
* returns the dock widget this belongs to
*/
CDockWidget* dockWidget() const;
Q_SIGNALS:
void elidedChanged(bool elided);
void clicked();

14
src/SideTabBar.cpp
View File

@ -123,4 +123,18 @@ Qt::Orientation CSideTabBar::orientation() const
{
return d->Orientation;
}
//============================================================================
CDockWidgetSideTab* CSideTabBar::tabAt(int index) const
{
return qobject_cast<CDockWidgetSideTab*>(d->TabsLayout->itemAt(index)->widget());
}
//============================================================================
int CSideTabBar::tabCount() const
{
return d->TabsLayout->count();
}
}

10
src/SideTabBar.h
View File

@ -84,6 +84,16 @@ public:
*/
Qt::Orientation orientation() const;
/*
* get the side tab widget at position, returns nullptr if it's out of bounds
*/
CDockWidgetSideTab* tabAt(int index) const;
/*
* Gets the count of the tab widgets
*/
int tabCount() const;
Q_SIGNALS:
void sideTabAutoHideToggleRequested();
};