From 87be0400e7294f50a4527ddc0878be2f6eddad8e Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Fri, 10 Sep 2021 17:00:41 +0000 Subject: qsui: disabled floatable QDockWidgets under Wayland git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@10279 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Ui/qsui/dockwidgetlist.cpp | 4 ++++ src/plugins/Ui/qsui/mainwindow.cpp | 6 ++++++ 2 files changed, 10 insertions(+) (limited to 'src/plugins') 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)) -- cgit v1.2.3-13-gbd6f