mirrors/Qt-Advanced-Docking-System
1
0
Fork 0
mirror of https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System.git synced 2025-02-04 01:59:19 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add top area

Browse Source
This commit is contained in:
Syarif Fakhri 2022-10-14 21:13:32 +08:00
parent ac8cf863a0
commit f9b62234b0
6 changed files with 90 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/AutoHideDockContainer.cpp
View File

@ -80,6 +80,10 @@ struct AutoHideDockContainerPrivate
{ {
return BottomDockWidgetArea; return BottomDockWidgetArea;
} }
case CDockWidgetSideTab::Top:
{
return TopDockWidgetArea;
}
} }
return LeftDockWidgetArea; return LeftDockWidgetArea;
@ -106,6 +110,10 @@ struct AutoHideDockContainerPrivate
{ {
return QPoint(_this->width() / 2, _this->height() - 1); return QPoint(_this->width() / 2, _this->height() - 1);
} }
case CDockWidgetSideTab::Top:
{
return QPoint(_this->width() / 2, 1);
}
} }
return QPoint(); return QPoint();
@ -125,6 +133,11 @@ struct AutoHideDockContainerPrivate
return QRect(QPoint(topLeft.x(), topLeft.y() - handleSize), QSize(rect.size().width(), rect.size().height() + handleSize)); return QRect(QPoint(topLeft.x(), topLeft.y() - handleSize), QSize(rect.size().width(), rect.size().height() + handleSize));
} }
if (SideTabBarArea == CDockWidgetSideTab::Top)
{
return QRect(QPoint(topLeft.x(), topLeft.y()), QSize(rect.size().width(), rect.size().height() + handleSize));
}
auto offset = 0; auto offset = 0;
if (SideTabBarArea == CDockWidgetSideTab::SideTabBarArea::RightTop || SideTabBarArea == CDockWidgetSideTab::SideTabBarArea::RightBottom) if (SideTabBarArea == CDockWidgetSideTab::SideTabBarArea::RightTop || SideTabBarArea == CDockWidgetSideTab::SideTabBarArea::RightBottom)
{ {
@ -150,7 +163,7 @@ CDockContainerWidget* CAutoHideDockContainer::parentContainer() const
//============================================================================ //============================================================================
CAutoHideDockContainer::CAutoHideDockContainer(CDockManager* DockManager, CDockWidgetSideTab::SideTabBarArea area, CDockContainerWidget* parent) : CAutoHideDockContainer::CAutoHideDockContainer(CDockManager* DockManager, CDockWidgetSideTab::SideTabBarArea area, CDockContainerWidget* parent) :
QSplitter(area == CDockWidgetSideTab::Bottom ? Qt::Orientation::Vertical : Qt::Orientation::Horizontal, parent), QSplitter((area == CDockWidgetSideTab::Bottom || area == CDockWidgetSideTab::Top) ? Qt::Orientation::Vertical : Qt::Orientation::Horizontal, parent),
d(new AutoHideDockContainerPrivate(this)) d(new AutoHideDockContainerPrivate(this))
{ {
d->DockManager = DockManager; d->DockManager = DockManager;
@ -170,6 +183,12 @@ CAutoHideDockContainer::CAutoHideDockContainer(CDockManager* DockManager, CDockW
switch (area) switch (area)
{ {
case CDockWidgetSideTab::Top:
{
addWidget(d->DockArea);
addWidget(emptyWidget);
break;
}
case CDockWidgetSideTab::LeftBottom: case CDockWidgetSideTab::LeftBottom:
case CDockWidgetSideTab::LeftTop: case CDockWidgetSideTab::LeftTop:
{ {
@ -469,6 +488,10 @@ bool CAutoHideDockContainer::areaExistsInConfig(CDockWidgetSideTab::SideTabBarAr
{ {
return CDockManager::testConfigFlag(CDockManager::DockContainerHasBottomSideBar); return CDockManager::testConfigFlag(CDockManager::DockContainerHasBottomSideBar);
} }
case CDockWidgetSideTab::Top:
{
return CDockManager::testConfigFlag(CDockManager::DockContainerHasTopSideBar);
}
} }
return true; return true;

31
src/DockContainerWidget.cpp
View File

@ -1440,7 +1440,7 @@ CDockContainerWidget::CDockContainerWidget(CDockManager* DockManager, QWidget *p
d->Layout->setContentsMargins(0, 0, 0, 0); d->Layout->setContentsMargins(0, 0, 0, 0);
d->Layout->setSpacing(0); d->Layout->setSpacing(0);
d->Layout->setColumnStretch(1, 1); d->Layout->setColumnStretch(1, 1);
d->Layout->setRowStretch(0, 1); d->Layout->setRowStretch(1, 1);
setLayout(d->Layout); setLayout(d->Layout);
// The function d->newSplitter() accesses the config flags from dock // The function d->newSplitter() accesses the config flags from dock
@ -1523,16 +1523,21 @@ CAutoHideDockContainer* CDockContainerWidget::createAndInitializeAutoHideDockWid
//============================================================================ //============================================================================
CDockWidgetSideTab::SideTabBarArea CDockContainerWidget::getDockAreaPosition(CDockAreaWidget* DockAreaWidget) CDockWidgetSideTab::SideTabBarArea CDockContainerWidget::getDockAreaPosition(CDockAreaWidget* DockAreaWidget)
{ {
// Handle bottom case // Handle bottom case and top case
// It's bottom if the width is wider than the height, and if it's below 50% of the window // It's bottom if the width is wider than the height, and if it's below 50% of the window
const auto dockWidgetFrameGeometry = DockAreaWidget->frameGeometry(); const auto dockWidgetFrameGeometry = DockAreaWidget->frameGeometry();
const auto splitterCenter = rootSplitter()->mapToGlobal(rootSplitter()->frameGeometry().center()); const auto splitterCenter = rootSplitter()->mapToGlobal(rootSplitter()->frameGeometry().center());
if (dockWidgetFrameGeometry.width() > dockWidgetFrameGeometry.height() if (dockWidgetFrameGeometry.width() > dockWidgetFrameGeometry.height())
&& DockAreaWidget->mapToGlobal(dockWidgetFrameGeometry.topLeft()).y() > splitterCenter.y()
&& CDockManager::testConfigFlag(CDockManager::DockContainerHasBottomSideBar))
{ {
return CDockWidgetSideTab::Bottom; if (DockAreaWidget->mapToGlobal(dockWidgetFrameGeometry.topLeft()).y() > splitterCenter.y() && CDockManager::testConfigFlag(CDockManager::DockContainerHasBottomSideBar))
{
return CDockWidgetSideTab::Bottom;
}
if (CDockManager::testConfigFlag(CDockManager::DockContainerHasTopSideBar))
{
return CDockWidgetSideTab::Top;
}
} }
// Then handle left and right // Then handle left and right
@ -2040,7 +2045,7 @@ void CDockContainerWidget::createRootSplitter()
return; return;
} }
d->RootSplitter = d->newSplitter(Qt::Horizontal); d->RootSplitter = d->newSplitter(Qt::Horizontal);
d->Layout->addWidget(d->RootSplitter, 0, 1); // Add it to the center - the 0 and 2 indexes are used for the SideTabBar widgets d->Layout->addWidget(d->RootSplitter, 1, 1); // Add it to the center - the 0 and 2 indexes are used for the SideTabBar widgets
} }
@ -2055,7 +2060,7 @@ void CDockContainerWidget::createSideTabBarWidgets()
leftLayout->addStretch(1); leftLayout->addStretch(1);
d->SideTabBarWidgets[CDockWidgetSideTab::LeftBottom] = new CSideTabBar(this, Qt::Vertical); d->SideTabBarWidgets[CDockWidgetSideTab::LeftBottom] = new CSideTabBar(this, Qt::Vertical);
leftLayout->addWidget(d->SideTabBarWidgets[CDockWidgetSideTab::LeftBottom]); leftLayout->addWidget(d->SideTabBarWidgets[CDockWidgetSideTab::LeftBottom]);
d->Layout->addLayout(leftLayout, 0, 0); d->Layout->addLayout(leftLayout, 1, 0);
} }
if (CDockManager::testConfigFlag(CDockManager::DockContainerHasRightSideBar)) if (CDockManager::testConfigFlag(CDockManager::DockContainerHasRightSideBar))
@ -2066,13 +2071,19 @@ void CDockContainerWidget::createSideTabBarWidgets()
rightLayout->addStretch(1); rightLayout->addStretch(1);
d->SideTabBarWidgets[CDockWidgetSideTab::RightBottom] = new CSideTabBar(this, Qt::Vertical); d->SideTabBarWidgets[CDockWidgetSideTab::RightBottom] = new CSideTabBar(this, Qt::Vertical);
rightLayout->addWidget(d->SideTabBarWidgets[CDockWidgetSideTab::RightBottom]); rightLayout->addWidget(d->SideTabBarWidgets[CDockWidgetSideTab::RightBottom]);
d->Layout->addLayout(rightLayout, 0, 2); d->Layout->addLayout(rightLayout, 1, 2);
} }
if (CDockManager::testConfigFlag(CDockManager::DockContainerHasBottomSideBar)) if (CDockManager::testConfigFlag(CDockManager::DockContainerHasBottomSideBar))
{ {
d->SideTabBarWidgets[CDockWidgetSideTab::Bottom] = new CSideTabBar(this, Qt::Horizontal); d->SideTabBarWidgets[CDockWidgetSideTab::Bottom] = new CSideTabBar(this, Qt::Horizontal);
d->Layout->addWidget(d->SideTabBarWidgets[CDockWidgetSideTab::Bottom], 1, 1); d->Layout->addWidget(d->SideTabBarWidgets[CDockWidgetSideTab::Bottom], 2, 1);
}
if (CDockManager::testConfigFlag(CDockManager::DockContainerHasTopSideBar))
{
d->SideTabBarWidgets[CDockWidgetSideTab::Top] = new CSideTabBar(this, Qt::Horizontal);
d->Layout->addWidget(d->SideTabBarWidgets[CDockWidgetSideTab::Top], 0, 1);
} }
} }

15
src/DockManager.h
View File

@ -229,15 +229,18 @@ public:
DockContainerHasLeftSideBar = 0x01, //!< If the flag is set left side bar will prioritize showing icons only over text DockContainerHasLeftSideBar = 0x01, //!< If the flag is set left side bar will prioritize showing icons only over text
DockContainerHasRightSideBar = 0x02, //!< If the flag is set right side bar will prioritize showing icons only over text DockContainerHasRightSideBar = 0x02, //!< If the flag is set right side bar will prioritize showing icons only over text
DockContainerHasBottomSideBar = 0x04, //!< If the flag is set right side bar will prioritize showing icons only over text DockContainerHasBottomSideBar = 0x04, //!< If the flag is set right side bar will prioritize showing icons only over text
DockAreaHasAutoHideButton = 0x08, //!< If the flag is set each dock area has a auto hide menu button DockContainerHasTopSideBar = 0x08, //!< If the flag is set right side bar will prioritize showing icons only over text
LeftSideBarPrioritizeIconOnly = 0x10, //!< If the flag is set each container will have a left side bar DockAreaHasAutoHideButton = 0x10, //!< If the flag is set each dock area has a auto hide menu button
RightSideBarPrioritizeIconOnly = 0x20, //!< If the flag is set each container will have a right side bar LeftSideBarPrioritizeIconOnly = 0x20, //!< If the flag is set each container will have a left side bar
BottomSideBarPrioritizeIconOnly = 0x40, //!< If the flag is set bottom side bar will prioritize showing icons only over text RightSideBarPrioritizeIconOnly = 0x40, //!< If the flag is set each container will have a right side bar
AutoHideDockAreaHasTitle = 0x80, //!< If the flag is set overlay dock area title bar will show the window title BottomSideBarPrioritizeIconOnly = 0x80, //!< If the flag is set bottom side bar will prioritize showing icons only over text
TopSideBarPrioritizeIconOnly = 0x100, //!< If the flag is set bottom side bar will prioritize showing icons only over text
AutoHideDockAreaHasTitle = 0x200, //!< If the flag is set overlay dock area title bar will show the window title
DefaultAutoHideConfig = DockContainerHasLeftSideBar DefaultAutoHideConfig = DockContainerHasLeftSideBar | BottomSideBarPrioritizeIconOnly | TopSideBarPrioritizeIconOnly
| DockContainerHasRightSideBar | DockContainerHasRightSideBar
| DockContainerHasBottomSideBar | DockContainerHasBottomSideBar
| DockContainerHasTopSideBar
| DockAreaHasAutoHideButton | DockAreaHasAutoHideButton
| AutoHideDockAreaHasTitle, ///< the default configuration for left and right side bars | AutoHideDockAreaHasTitle, ///< the default configuration for left and right side bars
}; };

11
src/DockWidgetSideTab.cpp
View File

@ -106,7 +106,7 @@ struct DockWidgetSideTabPrivate
} }
else if (Orientation == Qt::Horizontal) else if (Orientation == Qt::Horizontal)
{ {
TitleLayout->setContentsMargins(Spacing / 2, Spacing / 2, Spacing, Spacing); TitleLayout->setContentsMargins(Spacing / 2, Spacing, Spacing, Spacing);
if (IconLabel) if (IconLabel)
{ {
IconLabel->setContentsMargins(Spacing / 2, Spacing / 2, 0, Spacing / 2); IconLabel->setContentsMargins(Spacing / 2, Spacing / 2, 0, Spacing / 2);
@ -276,7 +276,7 @@ void CDockWidgetSideTab::setOrientation(Qt::Orientation Orientation)
//============================================================================ //============================================================================
void CDockWidgetSideTab::updateOrientationAndSpacing(SideTabBarArea area) void CDockWidgetSideTab::updateOrientationAndSpacing(SideTabBarArea area)
{ {
setOrientation(area == Bottom ? Qt::Horizontal : Qt::Vertical); setOrientation((area == Bottom || area == Top) ? Qt::Horizontal : Qt::Vertical);
d->updateContentsMargins(); d->updateContentsMargins();
@ -304,6 +304,13 @@ void CDockWidgetSideTab::updateOrientationAndSpacing(SideTabBarArea area)
return; return;
} }
if (CDockManager::testConfigFlag(CDockManager::BottomSideBarPrioritizeIconOnly) && area == Bottom) if (CDockManager::testConfigFlag(CDockManager::BottomSideBarPrioritizeIconOnly) && area == Bottom)
{
d->TitleLabel->hide();
d->TitleLayout->setContentsMargins(0, 0, 0, 0);
d->IconLabel->setContentsMargins(Spacing / 2, Spacing / 2, Spacing / 2, Spacing);
return;
}
if (CDockManager::testConfigFlag(CDockManager::TopSideBarPrioritizeIconOnly) && area == Top)
{ {
d->TitleLabel->hide(); d->TitleLabel->hide();
d->TitleLayout->setContentsMargins(0, 0, 0, 0); d->TitleLayout->setContentsMargins(0, 0, 0, 0);

1
src/DockWidgetSideTab.h
View File

@ -77,6 +77,7 @@ public:
*/ */
enum SideTabBarArea enum SideTabBarArea
{ {
Top,
LeftTop, LeftTop,
LeftBottom, LeftBottom,
RightTop, RightTop,

35
src/stylesheets/focus_highlighting.css
View File

@ -27,17 +27,22 @@ ads--CDockWidgetSideTab {
qproperty-iconSize: 16px 16px;/* this is optional in case you would like to change icon size*/ qproperty-iconSize: 16px 16px;/* this is optional in case you would like to change icon size*/
} }
ads--CDockWidgetSideTab[sideTabBarArea="0"],[sideTabBarArea="1"] { ads--CDockWidgetSideTab[sideTabBarArea="0"] {
border-top: 3px solid grey;
border-right: 1px solid white;
}
ads--CDockWidgetSideTab[sideTabBarArea="1"],[sideTabBarArea="2"] {
border-left: 3px solid grey; border-left: 3px solid grey;
border-bottom: 1px solid white; border-bottom: 1px solid white;
} }
ads--CDockWidgetSideTab[sideTabBarArea="2"],[sideTabBarArea="3"] { ads--CDockWidgetSideTab[sideTabBarArea="3"],[sideTabBarArea="4"] {
border-right: 3px solid grey; border-right: 3px solid grey;
border-bottom: 1px solid white; border-bottom: 1px solid white;
} }
ads--CDockWidgetSideTab[sideTabBarArea="4"] { ads--CDockWidgetSideTab[sideTabBarArea="5"] {
border-bottom: 3px solid grey; border-bottom: 3px solid grey;
border-right: 1px solid white; border-right: 1px solid white;
} }
@ -120,27 +125,39 @@ ads--CDockSplitter::handle {
} }
/* Focus related styling */ /* Focus related styling */
ads--CDockWidgetSideTab:hover[sideTabBarArea="0"],:hover[sideTabBarArea="1"] { ads--CDockWidgetSideTab:hover[sideTabBarArea="0"] {
border-top: 3px solid palette(highlight);
}
ads--CDockWidgetSideTab:hover[sideTabBarArea="1"],:hover[sideTabBarArea="2"] {
border-left: 3px solid palette(highlight); border-left: 3px solid palette(highlight);
} }
ads--CDockWidgetSideTab:hover[sideTabBarArea="2"],:hover[sideTabBarArea="3"] { ads--CDockWidgetSideTab:hover[sideTabBarArea="3"],:hover[sideTabBarArea="4"] {
border-right: 3px solid palette(highlight); border-right: 3px solid palette(highlight);
} }
ads--CDockWidgetSideTab:hover[sideTabBarArea="4"] { ads--CDockWidgetSideTab:hover[sideTabBarArea="5"] {
border-bottom: 3px solid palette(highlight); border-bottom: 3px solid palette(highlight);
} }
ads--CDockWidgetSideTab[sideTabBarArea="0"][focused="true"],[sideTabBarArea="1"][focused="true"] { ads--CDockWidgetSideTab:hover[sideTabBarArea="0"][focused="true"] {
border-top: 3px solid palette(highlight);
}
ads--CDockWidgetSideTab[sideTabBarArea="0"][focused="true"] {
border-top: 3px solid palette(highlight);
}
ads--CDockWidgetSideTab[sideTabBarArea="1"][focused="true"],[sideTabBarArea="2"][focused="true"] {
border-left: 3px solid palette(highlight); border-left: 3px solid palette(highlight);
} }
ads--CDockWidgetSideTab[sideTabBarArea="2"][focused="true"],[sideTabBarArea="3"][focused="true"] { ads--CDockWidgetSideTab[sideTabBarArea="3"][focused="true"],[sideTabBarArea="4"][focused="true"] {
border-right: 3px solid palette(highlight); border-right: 3px solid palette(highlight);
} }
ads--CDockWidgetSideTab[sideTabBarArea="4"][focused="true"] { ads--CDockWidgetSideTab[sideTabBarArea="5"][focused="true"] {
border-bottom: 3px solid palette(highlight); border-bottom: 3px solid palette(highlight);
} }