aboutsummaryrefslogtreecommitdiff
path: root/src/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/Ui/qsui/dockwidgetlist.cpp4
-rw-r--r--src/plugins/Ui/qsui/mainwindow.cpp6
2 files changed, 10 insertions, 0 deletions
diff --git a/src/plugins/Ui/qsui/dockwidgetlist.cpp b/src/plugins/Ui/qsui/dockwidgetlist.cpp
index 78f663e04..906e12201 100644
--- a/src/plugins/Ui/qsui/dockwidgetlist.cpp
+++ b/src/plugins/Ui/qsui/dockwidgetlist.cpp
@@ -20,6 +20,8 @@ DockWidgetList::DockWidgetList(QMainWindow *parent) : QObject(parent), m_mw(pare
dockWidget->toggleViewAction()->setShortcut(desc.shortcut);
dockWidget->setObjectName(id);
dockWidget->setAllowedAreas(desc.allowedAreas);
+ if(qApp->platformName() == QLatin1String("wayland"))
+ dockWidget->setFeatures(QDockWidget::DockWidgetClosable | QDockWidget::DockWidgetMovable);
m_mw->addDockWidget(desc.area, dockWidget);
connect(dockWidget->toggleViewAction(), SIGNAL(triggered(bool)), SLOT(onViewActionTriggered(bool)));
connect(dockWidget, SIGNAL(visibilityChanged(bool)), SLOT(onVisibilityChanged(bool)));
@@ -122,6 +124,8 @@ void DockWidgetList::onWidgetAdded(const QString &id)
QDockWidget *dockWidget = new QDockWidget(desc.name, m_mw);
dockWidget->setObjectName(id);
dockWidget->setAllowedAreas(desc.allowedAreas);
+ if(qApp->platformName() == QLatin1String("wayland"))
+ dockWidget->setFeatures(QDockWidget::DockWidgetClosable | QDockWidget::DockWidgetMovable);
if(m_menu && m_beforeAction)
m_menu->insertAction(m_beforeAction, dockWidget->toggleViewAction());
m_mw->addDockWidget(desc.area, dockWidget);
diff --git a/src/plugins/Ui/qsui/mainwindow.cpp b/src/plugins/Ui/qsui/mainwindow.cpp
index 8c51aa22b..b868a66c4 100644
--- a/src/plugins/Ui/qsui/mainwindow.cpp
+++ b/src/plugins/Ui/qsui/mainwindow.cpp
@@ -860,6 +860,12 @@ void MainWindow::setTitleBarsVisible(bool visible)
m_ui.waveformSeekBarDockWidget
};
+ if(qApp->platformName() == QLatin1String("wayland"))
+ {
+ for(QDockWidget *w : qAsConst(widgetList))
+ w->setFeatures(QDockWidget::DockWidgetClosable | QDockWidget::DockWidgetMovable);
+ }
+
if(visible)
{
for(QDockWidget *w : qAsConst(widgetList))