mirrors/Qt-Advanced-Docking-System
1
0
Fork 0
mirror of https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System.git synced 2024-11-15 21:25:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix tooltips for auto hide button and close button

Browse Source
This commit is contained in:
Syarif Fakhri 2022-09-09 14:43:59 +08:00
parent 22402e79f5
commit 621e5e7789
6 changed files with 46 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/DockAreaTitleBar.cpp
View File

@ -188,7 +188,7 @@ void DockAreaTitleBarPrivate::createButtons()
AutoHideButton->setAutoRaise(true);
AutoHideButton->setCheckable(true);
AutoHideButton->setChecked(false);
internal::setToolTip(AutoHideButton, QObject::tr("Toggle Auto Hide Group"));
internal::setToolTip(AutoHideButton, QObject::tr("Toggle Auto Hide"));
internal::setButtonIcon(AutoHideButton, QStyle::SP_DialogOkButton, ads::AutoHideIcon);
AutoHideButton->setSizePolicy(ButtonSizePolicy);
Layout->addWidget(AutoHideButton, 0);
@ -199,14 +199,7 @@ void DockAreaTitleBarPrivate::createButtons()
CloseButton->setObjectName("dockAreaCloseButton");
CloseButton->setAutoRaise(true);
internal::setButtonIcon(CloseButton, QStyle::SP_TitleBarCloseButton, ads::DockAreaCloseIcon);
if (testConfigFlag(CDockManager::DockAreaCloseButtonClosesTab))
{
internal::setToolTip(CloseButton, QObject::tr("Close Active Tab"));
}
else
{
internal::setToolTip(CloseButton, QObject::tr("Close Group"));
}
internal::setToolTip(CloseButton, _this->closeGroupToolTip());
CloseButton->setSizePolicy(ButtonSizePolicy);
CloseButton->setIconSize(QSize(16, 16));
Layout->addWidget(CloseButton, 0);
@ -664,6 +657,22 @@ int CDockAreaTitleBar::indexOf(QWidget *widget) const
return d->Layout->indexOf(widget);
}
//============================================================================
QString CDockAreaTitleBar::closeGroupToolTip() const
{
if (d->DockArea->isOverlayed())
{
return QObject::tr("Close Overlay");
}
if (CDockManager::testConfigFlag(CDockManager::DockAreaCloseButtonClosesTab))
{
return QObject::tr("Close Active Tab");
}
return QObject::tr("Close Group") ;
}
//============================================================================
CTitleBarButton::CTitleBarButton(bool visible, QWidget* parent)
: tTitleBarButton(parent),

6
src/DockAreaTitleBar.h
View File

@ -155,6 +155,12 @@ public:
*/
int indexOf(QWidget *widget) const;
/**
* Close group tool tip based on the current state
* Overlayed widgets can only have one dock widget so it does not make sense for the tooltip to show close group
*/
QString closeGroupToolTip() const;
Q_SIGNALS:
/**
* This signal is emitted if a tab in the tab bar is clicked by the user

11
src/DockAreaWidget.cpp
View File

@ -832,7 +832,7 @@ void CDockAreaWidget::markTitleBarMenuOutdated()
//============================================================================
void CDockAreaWidget::updateAutoHidebuttonCheckState()
void CDockAreaWidget::updateAutoHideButtonCheckState()
{
auto autoHideButton = titleBarButton(TitleBarButtonAutoHide);
autoHideButton->blockSignals(true);
@ -840,12 +840,21 @@ void CDockAreaWidget::updateAutoHidebuttonCheckState()
autoHideButton->blockSignals(false);
}
//============================================================================
void CDockAreaWidget::updateTitleBarButtonVisibility(bool IsTopLevel) const
{
d->updateTitleBarButtonVisibility(IsTopLevel);
}
//============================================================================
void CDockAreaWidget::updateTitleBarButtonToolTip()
{
internal::setToolTip(titleBarButton(TitleBarButtonClose), titleBar()->closeGroupToolTip());
}
//============================================================================
void CDockAreaWidget::saveState(QXmlStreamWriter& s) const
{

7
src/DockAreaWidget.h
View File

@ -154,13 +154,18 @@ protected:
/*
* Update the auto hide button checked state based on if it's overlayed or not
*/
void updateAutoHidebuttonCheckState();
void updateAutoHideButtonCheckState();
/*
* Update the title bar button visibility based on if it's top level or not
*/
void updateTitleBarButtonVisibility(bool IsTopLevel) const;
/*
* Update the title bar button tooltips
*/
void updateTitleBarButtonToolTip();
protected Q_SLOTS:
void toggleView(bool Open);

6
src/DockContainerWidget.cpp
View File

@ -1058,7 +1058,8 @@ bool DockContainerWidgetPrivate::restoreOverlayDockArea(CDockingStateReader& s,
dockContainer->hide();
DockArea = dockContainer->dockAreaWidget();
DockArea->updateAutoHidebuttonCheckState();
DockArea->updateAutoHideButtonCheckState();
DockArea->updateTitleBarButtonToolTip();
}
while (s.readNextStartElement())
@ -1653,7 +1654,8 @@ void CDockContainerWidget::removeDockArea(CDockAreaWidget* area)
dumpLayout();
d->emitDockAreasRemoved();
area->setOverlayDockContainer(nullptr);
area->updateAutoHidebuttonCheckState();
area->updateAutoHideButtonCheckState();
area->updateTitleBarButtonToolTip();
return;
}

3
src/OverlayDockContainer.cpp
View File

@ -83,7 +83,8 @@ COverlayDockContainer::COverlayDockContainer(CDockManager* DockManager, CDockWid
d->DockArea = new CDockAreaWidget(DockManager, parent);
d->DockArea->setObjectName("OverlayDockArea");
d->DockArea->setOverlayDockContainer(this);
d->DockArea->updateAutoHidebuttonCheckState();
d->DockArea->updateAutoHideButtonCheckState();
d->DockArea->updateTitleBarButtonToolTip();
QBoxLayout* l = new QBoxLayout(QBoxLayout::LeftToRight);
d->Splitter = new QSplitter(Qt::Orientation::Horizontal);