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

Made naming of auto hide config flags explicit

Browse Source
This commit is contained in:
Uwe Kindler 2022-11-01 14:36:09 +01:00
parent bfad80c540
commit 94b80423d7
7 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/AutoHideTab.cpp
View File

@ -85,19 +85,19 @@ void AutoHideTabPrivate::updateOrientation()
switch (area)
{
case SideBarLocation::Left:
IconOnly = CDockManager::testConfigFlag(CDockManager::LeftSideBarIconOnly);
IconOnly = CDockManager::testAutoHideConfigFlag(CDockManager::LeftSideBarIconOnly);
break;
case SideBarLocation::Right:
IconOnly = CDockManager::testConfigFlag(CDockManager::RightSideBarIconOnly);
IconOnly = CDockManager::testAutoHideConfigFlag(CDockManager::RightSideBarIconOnly);
break;
case SideBarLocation::Top:
IconOnly = CDockManager::testConfigFlag(CDockManager::BottomSideBarIconOnly);
IconOnly = CDockManager::testAutoHideConfigFlag(CDockManager::BottomSideBarIconOnly);
break;
case SideBarLocation::Bottom:
IconOnly = CDockManager::testConfigFlag(CDockManager::TopSideBarIconOnly);
IconOnly = CDockManager::testAutoHideConfigFlag(CDockManager::TopSideBarIconOnly);
break;
}

10
src/DockAreaTitleBar.cpp
View File

@ -124,9 +124,9 @@ struct DockAreaTitleBarPrivate
* Returns true if the given config flag is set
* Convenience function to ease config flag testing
*/
static bool testConfigFlag(CDockManager::eAutoHideFlag Flag)
static bool testAutoHideConfigFlag(CDockManager::eAutoHideFlag Flag)
{
return CDockManager::testConfigFlag(Flag);
return CDockManager::testAutoHideConfigFlag(Flag);
}
/**
@ -191,14 +191,14 @@ void DockAreaTitleBarPrivate::createButtons()
_this->connect(UndockButton, SIGNAL(clicked()), SLOT(onUndockButtonClicked()));
// AutoHide Button
const auto autoHideEnabled = testConfigFlag(CDockManager::AutoHideFeatureEnabled);
AutoHideButton = new CTitleBarButton(testConfigFlag(CDockManager::DockAreaHasAutoHideButton) && autoHideEnabled);
const auto autoHideEnabled = testAutoHideConfigFlag(CDockManager::AutoHideFeatureEnabled);
AutoHideButton = new CTitleBarButton(testAutoHideConfigFlag(CDockManager::DockAreaHasAutoHideButton) && autoHideEnabled);
AutoHideButton->setObjectName("dockAreaAutoHideButton");
AutoHideButton->setAutoRaise(true);
internal::setToolTip(AutoHideButton, QObject::tr("Toggle Auto Hide"));
internal::setButtonIcon(AutoHideButton, QStyle::SP_DialogOkButton, ads::AutoHideIcon);
AutoHideButton->setSizePolicy(ButtonSizePolicy);
AutoHideButton->setCheckable(testConfigFlag(CDockManager::AutoHideButtonCheckable));
AutoHideButton->setCheckable(testAutoHideConfigFlag(CDockManager::AutoHideButtonCheckable));
AutoHideButton->setChecked(false);
Layout->addWidget(AutoHideButton, 0);
_this->connect(AutoHideButton, SIGNAL(clicked()), SLOT(onAutoHideButtonClicked()));

2
src/DockAreaWidget.cpp
View File

@ -1176,7 +1176,7 @@ void CDockAreaWidget::toggleAutoHideArea(bool Enable)
const auto area = dockContainer()->calculateSideTabBarArea(this);
if (dockManager()->testConfigFlag(CDockManager::AutoHideButtonTogglesArea))
if (CDockManager::testAutoHideConfigFlag(CDockManager::AutoHideButtonTogglesArea))
{
for (const auto DockWidget : openedDockWidgets())
{

6
src/DockContainerWidget.cpp
View File

@ -1045,7 +1045,7 @@ bool DockContainerWidgetPrivate::restoreSideBar(CDockingStateReader& s,
Q_UNUSED(CreatedWidget)
// Simply ignore side bar auto hide widgets from saved state if
// auto hide support is disabled
if (!CDockManager::testConfigFlag(CDockManager::AutoHideFeatureEnabled))
if (!CDockManager::testAutoHideConfigFlag(CDockManager::AutoHideFeatureEnabled))
{
return true;
}
@ -1374,7 +1374,7 @@ CDockAreaWidget* CDockContainerWidget::addDockWidget(DockWidgetArea area, CDockW
CAutoHideDockContainer* CDockContainerWidget::createAndSetupAutoHideContainer(
SideBarLocation area, CDockWidget* DockWidget, CDockWidget::eAutoHideInsertOrder insertOrder)
{
if (!CDockManager::testConfigFlag(CDockManager::AutoHideFeatureEnabled))
if (!CDockManager::testAutoHideConfigFlag(CDockManager::AutoHideFeatureEnabled))
{
Q_ASSERT_X(false, "CDockContainerWidget::createAndInitializeDockWidgetOverlayContainer",
"Requested area does not exist in config");
@ -1951,7 +1951,7 @@ void CDockContainerWidget::createRootSplitter()
//============================================================================
void CDockContainerWidget::createSideTabBarWidgets()
{
if (!CDockManager::testConfigFlag(CDockManager::AutoHideFeatureEnabled))
if (!CDockManager::testAutoHideConfigFlag(CDockManager::AutoHideFeatureEnabled))
{
return;
}

2
src/DockManager.cpp
View File

@ -1183,7 +1183,7 @@ bool CDockManager::testConfigFlag(eConfigFlag Flag)
//===========================================================================
bool CDockManager::testConfigFlag(eAutoHideFlag Flag)
bool CDockManager::testAutoHideConfigFlag(eAutoHideFlag Flag)
{
return autoHideConfigFlags().testFlag(Flag);
}

2
src/DockManager.h
View File

@ -307,7 +307,7 @@ public:
/**
* Returns true if the given overlay config flag is set
*/
static bool testConfigFlag(eAutoHideFlag Flag);
static bool testAutoHideConfigFlag(eAutoHideFlag Flag);
/**
* Returns the global icon provider.

4
src/DockWidgetTab.cpp
View File

@ -343,10 +343,6 @@ CDockWidgetTab::CDockWidgetTab(CDockWidget* DockWidget, QWidget *parent) :
d->DockWidget = DockWidget;
d->createLayout();
setFocusPolicy(Qt::NoFocus);
/*if (CDockManager::testConfigFlag(CDockManager::FocusHighlighting))
{
setFocusPolicy(Qt::ClickFocus);
}*/
}
//============================================================================