Docking is made non-mandatory (#3578)

Author: NewtronReal

src/dialogs/preferences/ShortcutOptionsWidget.cpp

@@ -32,6 +32,7 @@ void ShortcutOptionsWidget::populateShortcutTree()
         { "Debug", tr("Debug") },           { "Functions", tr("Functions") },
         { "Omnibar", tr("Omnibar") },       { "Exports", tr("Exports") },
         { "Imports", tr("Imports") },       { "Overview", tr("Graph Overview") },
+        { "Docking", tr("Docking") },
     };
 
     QHash<QString, QTreeWidgetItem *> prefixToItem;

src/shortcuts/DefaultShortcuts.cpp

@@ -329,6 +329,12 @@ const QHash<QString, Shortcut> &getDefaultShortcuts()
             QT_TRANSLATE_NOOP("SearchBarWidget", "Show Search Bar Options Menu"),
             "SearchBarWidget" } },
 
+        // Docking
+        { "Docking.toggle",
+          { { Qt::Key_Alt },
+            QT_TRANSLATE_NOOP("CutterDockWidget", "Enable/Disable Docking"),
+            "CutterDockWidget" } },
+
     };
     return defaultShortcuts;
 }

src/shortcuts/ShortcutManager.cpp

@@ -1,6 +1,7 @@
 #include "ShortcutManager.h"
 #include <QCoreApplication>
 #include <QDebug>
+#include <qglobal.h>
 
 Q_GLOBAL_STATIC(ShortcutManager, uniqueInstance)
 
@@ -33,6 +34,36 @@ QKeySequence ShortcutManager::getKeySequence(const QString &id)
     return sequences.isEmpty() ? QKeySequence() : sequences.first();
 }
 
+Qt::KeyboardModifier ShortcutManager::convertKeyToModifer(const QKeySequence &sequence)
+{
+    if (sequence.isEmpty())
+        return Qt::NoModifier;
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+    Qt::Key key = static_cast<Qt::Key>(sequence[0] & ~Qt::KeyboardModifierMask);
+#else
+    QKeyCombination combo = sequence[0];
+    Qt::Key key = combo.key();
+#endif
+    switch (key) {
+    case Qt::Key_Alt:
+        return Qt::AltModifier;
+    case Qt::Key_Shift:
+        return Qt::ShiftModifier;
+
+    case Qt::Key_Control:
+        return Qt::ControlModifier;
+
+    case Qt::Key_Meta:
+        return Qt::MetaModifier;
+    case Qt::Key_AltGr:
+        return Qt::GroupSwitchModifier;
+
+    default:
+        return Qt::NoModifier;
+    }
+    return Qt::NoModifier;
+}
+
 Shortcut ShortcutManager::getShortcut(const QString &id)
 {
     const auto &defaultShortcuts = getDefaultShortcuts();

src/shortcuts/ShortcutManager.h

@@ -17,6 +17,7 @@ class ShortcutManager : public QObject
 
     Shortcut getShortcut(const QString &id);
     QKeySequence getKeySequence(const QString &id);
+    Qt::KeyboardModifier convertKeyToModifer(const QKeySequence &sequence);
     QList<QKeySequence> getKeySequences(const QString &id);
     QHash<QString, Shortcut> getAllShortcuts();
 

src/widgets/CutterDockWidget.cpp

@@ -3,6 +3,7 @@
 
 #include <QEvent>
 #include <QShortcut>
+#include <QApplication>
 
 CutterDockWidget::CutterDockWidget(MainWindow *parent, QAction *) : CutterDockWidget(parent) {}
 
@@ -14,6 +15,24 @@ CutterDockWidget::CutterDockWidget(MainWindow *parent) : QDockWidget(parent), ma
     connect(toggleViewAction(), &QAction::triggered, this, &QWidget::raise);
 }
 
+bool CutterDockWidget::event(QEvent *event)
+{
+
+    if (event->type() == QEvent::Move || event->type() == QEvent::MouseMove) {
+
+        Qt::KeyboardModifiers mods = QApplication::keyboardModifiers();
+        Qt::KeyboardModifier mod =
+                Shortcuts()->convertKeyToModifer(Shortcuts()->getKeySequence("Docking.toggle"));
+
+        if (mods & mod) {
+            setAllowedAreas(Qt::NoDockWidgetArea);
+        } else {
+            setAllowedAreas(Qt::AllDockWidgetAreas);
+        }
+    }
+    return QDockWidget::event(event);
+}
+
 CutterDockWidget::~CutterDockWidget() = default;
 
 bool CutterDockWidget::eventFilter(QObject *object, QEvent *event)

src/widgets/CutterDockWidget.h

@@ -3,7 +3,7 @@
 
 #include "core/CutterCommon.h"
 #include "common/RefreshDeferrer.h"
-
+#include "shortcuts/ShortcutManager.h"
 #include <QDockWidget>
 
 class MainWindow;
@@ -107,8 +107,13 @@ public slots:
 
 protected:
     virtual QWidget *widgetToFocusOnRaise();
-
     void closeEvent(QCloseEvent *event) override;
+
+    /**
+     * @brief On any event(targeting windowMove event) if the altmodifer is
+     * pressed then the dock will be non dockable.
+     */
+    bool event(QEvent *event) override;
     QString getDockNumber();
 
     MainWindow *mainWindow;