kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

GUI: Follow the widget indications when docking them (#12530)

Browse Source 
* GUI: Follow the widget indications when docking them

The overlay manager handles the creation and drawing of the title bars
for the docked widgets. When adding a QDockWidget the manager ignored
the set of features (closable, movable, floatable) provided by the
widget and always showed all the actions.

Amend the code to take into account the features specified by the
widget.

Closes #11944
This commit is contained in:
LemonBoy
2024-03-04 17:41:55 +01:00
committed by GitHub
parent 15b3b1d5dd
commit 1bcefaf9b1
2 changed files with 31 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/Gui/OverlayManager.cpp
View File

@@ -989,11 +989,23 @@ public:
{
OverlayTitleBar *widget = new OverlayTitleBar(parent);
widget->setObjectName(QStringLiteral("OverlayTitle"));
QList<QAction*> actions;
if (auto tabWidget = qobject_cast<OverlayTabWidget*>(parent))
actions = tabWidget->actions();
else if (auto dockWidget = qobject_cast<QDockWidget*>(parent))
{
const QDockWidget::DockWidgetFeatures features = dockWidget->features();
actions.append(&_actOverlay);
if (features.testFlag(QDockWidget::DockWidgetFloatable))
actions.append(&_actFloat);
if (features.testFlag(QDockWidget::DockWidgetClosable))
actions.append(&_actClose);
}
else
actions = _actions;
widget->setTitleItem(OverlayTabWidget::prepareTitleWidget(widget, actions));
return widget;
}
@@ -1528,6 +1540,8 @@ void OverlayManager::initDockWidget(QDockWidget *dw)
this, &OverlayManager::onToggleDockWidget);
QObject::connect(dw, &QDockWidget::visibilityChanged,
this, &OverlayManager::onDockVisibleChange);
QObject::connect(dw, &QDockWidget::featuresChanged,
this, &OverlayManager::onDockFeaturesChange);
if (auto widget = dw->widget()) {
QObject::connect(widget, &QWidget::windowTitleChanged,
this, &OverlayManager::onDockWidgetTitleChange);
@@ -1577,6 +1591,21 @@ void OverlayManager::onDockVisibleChange(bool visible)
<< " visible change " << visible << ", " << dock->isVisible());
}
void OverlayManager::onDockFeaturesChange(QDockWidget::DockWidgetFeatures features)
{
Q_UNUSED(features);
auto dw = qobject_cast<QDockWidget*>(sender());
if (!dw)
return;
// Rebuild the title widget as it may have a different set of buttons shown.
if (QWidget *titleBarWidget = dw->titleBarWidget()) {
dw->setTitleBarWidget(nullptr);
delete titleBarWidget;
}
setupTitleBar(dw);
}
void OverlayManager::onTaskViewUpdate()
{
auto taskview = qobject_cast<TaskView::TaskView*>(sender());