Merge branch 'Applications/18.04'

[dolphin.git] / src / dolphindockwidget.cpp

diff --git a/src/dolphindockwidget.cpp b/src/dolphindockwidget.cpp
index 0d8aea7bdf24ad7c398554042898106188a109d7..726338377daae192dd0f6bd70e47fd3344eefdaf 100644 (file)
--- a/src/dolphindockwidget.cpp
+++ b/src/dolphindockwidget.cpp
@@ -21,20 +21,30 @@
 
 #include <QStyle>
 
+namespace {
+    // Disable the 'Floatable' feature, i.e., the possibility to drag the
+    // dock widget out of the main window. This works around problems like
+    // https://bugs.kde.org/show_bug.cgi?id=288629
+    // https://bugs.kde.org/show_bug.cgi?id=322299
+    const QDockWidget::DockWidgetFeatures DefaultDockWidgetFeatures = QDockWidget::DockWidgetMovable | QDockWidget::DockWidgetClosable;
+}
+
  // Empty titlebar for the dock widgets when "Lock Layout" has been activated.
 class DolphinDockTitleBar : public QWidget
 {
+    Q_OBJECT
+
 public:
-    DolphinDockTitleBar(QWidget* parent = 0) : QWidget(parent) {}
-    virtual ~DolphinDockTitleBar() {}
+    explicit DolphinDockTitleBar(QWidget* parent = nullptr) : QWidget(parent) {}
+    ~DolphinDockTitleBar() override {}
 
-    virtual QSize minimumSizeHint() const
+    QSize minimumSizeHint() const override
     {
         const int border = style()->pixelMetric(QStyle::PM_DockWidgetTitleBarButtonMargin);
         return QSize(border, border);
     }
 
-    virtual QSize sizeHint() const
+    QSize sizeHint() const override
     {
         return minimumSizeHint();
     }
@@ -43,15 +53,17 @@ public:
 DolphinDockWidget::DolphinDockWidget(const QString& title, QWidget* parent, Qt::WindowFlags flags) :
     QDockWidget(title, parent, flags),
     m_locked(false),
-    m_dockTitleBar(0)
+    m_dockTitleBar(nullptr)
 {
+    setFeatures(DefaultDockWidgetFeatures);
 }
 
 DolphinDockWidget::DolphinDockWidget(QWidget* parent, Qt::WindowFlags flags) :
     QDockWidget(parent, flags),
     m_locked(false),
-    m_dockTitleBar(0)
+    m_dockTitleBar(nullptr)
 {
+    setFeatures(DefaultDockWidgetFeatures);
 }
 
 DolphinDockWidget::~DolphinDockWidget()
@@ -70,10 +82,8 @@ void DolphinDockWidget::setLocked(bool lock)
             setTitleBarWidget(m_dockTitleBar);
             setFeatures(QDockWidget::NoDockWidgetFeatures);
         } else {
-            setTitleBarWidget(0);
-            setFeatures(QDockWidget::DockWidgetMovable |
-                        QDockWidget::DockWidgetFloatable |
-                        QDockWidget::DockWidgetClosable);
+            setTitleBarWidget(nullptr);
+            setFeatures(DefaultDockWidgetFeatures);
         }
     }
 }