X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/67ebd66f94356b4e66005b1072919cb7b5e858bb..8ff6a5d2b775733a18b2c3ef13137a773288c1d8:/src/dolphindockwidget.cpp

diff --git a/src/dolphindockwidget.cpp b/src/dolphindockwidget.cpp
index 16f575583..930c38e35 100644
--- a/src/dolphindockwidget.cpp
+++ b/src/dolphindockwidget.cpp
@@ -8,27 +8,32 @@
 
 #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;
+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.
+// Empty titlebar for the dock widgets when "Lock Layout" has been activated.
 class DolphinDockTitleBar : public QWidget
 {
     Q_OBJECT
 
 public:
-    explicit DolphinDockTitleBar(QWidget* parent = nullptr) : QWidget(parent) {}
-    ~DolphinDockTitleBar() override {}
+    explicit DolphinDockTitleBar(QWidget *parent = nullptr)
+        : QWidget(parent)
+    {
+    }
+    ~DolphinDockTitleBar() override
+    {
+    }
 
     QSize minimumSizeHint() const override
     {
-        const int border = style()->pixelMetric(QStyle::PM_DockWidgetTitleBarButtonMargin);
-        return QSize(border, border);
+        return QSize(0, 0);
     }
 
     QSize sizeHint() const override
@@ -37,10 +42,10 @@ public:
     }
 };
 
-DolphinDockWidget::DolphinDockWidget(const QString& title, QWidget* parent, Qt::WindowFlags flags) :
-    QDockWidget(title, parent, flags),
-    m_locked(false),
-    m_dockTitleBar(nullptr)
+DolphinDockWidget::DolphinDockWidget(const QString &title, QWidget *parent, Qt::WindowFlags flags)
+    : QDockWidget(title, parent, flags)
+    , m_locked(false)
+    , m_dockTitleBar(nullptr)
 {
     setFeatures(DefaultDockWidgetFeatures);
 }
@@ -59,7 +64,7 @@ void DolphinDockWidget::setLocked(bool lock)
                 m_dockTitleBar = new DolphinDockTitleBar(this);
             }
             setTitleBarWidget(m_dockTitleBar);
-            setFeatures(QDockWidget::NoDockWidgetFeatures);
+            setFeatures(QDockWidget::DockWidgetClosable);
         } else {
             setTitleBarWidget(nullptr);
             setFeatures(DefaultDockWidgetFeatures);
@@ -73,3 +78,4 @@ bool DolphinDockWidget::isLocked() const
 }
 
 #include "dolphindockwidget.moc"
+#include "moc_dolphindockwidget.cpp"