Merge remote-tracking branch 'upstream/master' into work/zakharafoniam/useful-groups

[dolphin.git] / src / dolphindockwidget.cpp

diff --git a/src/dolphindockwidget.cpp b/src/dolphindockwidget.cpp
index 84902eb9c8673856661aca83c7f5222339bb7b18..930c38e355d8d6c7151e46a3bc8ca6d679067d80 100644 (file)
--- a/src/dolphindockwidget.cpp
+++ b/src/dolphindockwidget.cpp
@@ -33,8 +33,7 @@ public:
 
     QSize minimumSizeHint() const override
     {
-        const int border = style()->pixelMetric(QStyle::PM_DockWidgetTitleBarButtonMargin);
-        return QSize(border, border);
+        return QSize(0, 0);
     }
 
     QSize sizeHint() const override
@@ -65,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);