diff --git a/src/dolphindockwidget.cpp b/src/dolphindockwidget.cpp index 726338377..32d25702a 100644 --- a/src/dolphindockwidget.cpp +++ b/src/dolphindockwidget.cpp @@ -1,96 +1,88 @@ /*************************************************************************** * Copyright (C) 2010 by Peter Penz * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the * * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ #include "dolphindockwidget.h" #include 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: 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); } QSize sizeHint() const override { return minimumSizeHint(); } }; DolphinDockWidget::DolphinDockWidget(const QString& title, QWidget* parent, Qt::WindowFlags flags) : QDockWidget(title, parent, flags), m_locked(false), m_dockTitleBar(nullptr) { setFeatures(DefaultDockWidgetFeatures); } -DolphinDockWidget::DolphinDockWidget(QWidget* parent, Qt::WindowFlags flags) : - QDockWidget(parent, flags), - m_locked(false), - m_dockTitleBar(nullptr) -{ - setFeatures(DefaultDockWidgetFeatures); -} - DolphinDockWidget::~DolphinDockWidget() { } void DolphinDockWidget::setLocked(bool lock) { if (lock != m_locked) { m_locked = lock; if (lock) { if (!m_dockTitleBar) { m_dockTitleBar = new DolphinDockTitleBar(this); } setTitleBarWidget(m_dockTitleBar); setFeatures(QDockWidget::NoDockWidgetFeatures); } else { setTitleBarWidget(nullptr); setFeatures(DefaultDockWidgetFeatures); } } } bool DolphinDockWidget::isLocked() const { return m_locked; } #include "dolphindockwidget.moc" diff --git a/src/dolphindockwidget.h b/src/dolphindockwidget.h index c4fcbf753..0b745f083 100644 --- a/src/dolphindockwidget.h +++ b/src/dolphindockwidget.h @@ -1,49 +1,48 @@ /*************************************************************************** * Copyright (C) 2010 by Peter Penz * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the * * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ #ifndef DOLPHIN_DOCK_WIDGET_H #define DOLPHIN_DOCK_WIDGET_H #include /** * @brief Extends QDockWidget to be able to get locked. */ class DolphinDockWidget : public QDockWidget { Q_OBJECT public: - explicit DolphinDockWidget(const QString& title, QWidget* parent = nullptr, Qt::WindowFlags flags = nullptr); - explicit DolphinDockWidget(QWidget* parent = nullptr, Qt::WindowFlags flags = nullptr); + explicit DolphinDockWidget(const QString& title = QString(), QWidget* parent = nullptr, Qt::WindowFlags flags = nullptr); ~DolphinDockWidget() override; /** * @param lock If \a lock is true, the title bar of the dock-widget will get hidden so * that it is not possible for the user anymore to move or undock the dock-widget. */ void setLocked(bool lock); bool isLocked() const; private: bool m_locked; QWidget* m_dockTitleBar; }; #endif