Add Toolbar customization

src/base/preferences.cpp

@@ -1643,6 +1643,30 @@ void Preferences::setMainGeometry(const QByteArray &geometry)
     setValue(u"MainWindow/geometry"_s, geometry);
 }
 
+QByteArray Preferences::getToolbarState() const
+{
+    return value<QByteArray>(u"MainWindow/toolbarState"_s);
+}
+
+void Preferences::setToolbarState(const QByteArray &state)
+{
+    if (state == getToolbarState())
+        return;
+    setValue(u"MainWindow/toolbarState"_s, state);
+}
+
+bool Preferences::isToolbarLocked() const
+{
+    return value(u"MainWindow/toolbarLocked"_s, true);
+}
+
+void Preferences::setToolbarLocked(const bool locked)
+{
+    if (locked == isToolbarLocked())
+        return;
+    setValue(u"MainWindow/toolbarLocked"_s, locked);
+}
+
 bool Preferences::isFiltersSidebarVisible() const
 {
     return value(u"GUI/MainWindow/FiltersSidebarVisible"_s, true);

src/base/preferences.h

@@ -356,6 +356,10 @@ class Preferences final : public QObject
     void setDNSLastIP(const QString &ip);
     QByteArray getMainGeometry() const;
     void setMainGeometry(const QByteArray &geometry);
+    QByteArray getToolbarState() const;
+    void setToolbarState(const QByteArray &state);
+    bool isToolbarLocked() const;
+    void setToolbarLocked(const bool locked);
     bool isFiltersSidebarVisible() const;
     void setFiltersSidebarVisible(bool value);
     int getFiltersSidebarWidth() const;

src/gui/CMakeLists.txt

@@ -69,6 +69,7 @@ add_library(qbt_gui STATIC
     log/logfiltermodel.h
     log/loglistview.h
     log/logmodel.h
+    customizabletoolbar.h
     mainwindow.h
     optionsdialog.h
     powermanagement/inhibitor.h
@@ -175,6 +176,7 @@ add_library(qbt_gui STATIC
     log/logfiltermodel.cpp
     log/loglistview.cpp
     log/logmodel.cpp
+    customizabletoolbar.cpp
     mainwindow.cpp
     optionsdialog.cpp
     powermanagement/inhibitor.cpp
@@ -261,7 +263,7 @@ add_library(qbt_gui STATIC
 target_sources(qbt_gui INTERFACE about.qrc)
 
 # UI headers will be generated in ${CMAKE_CURRENT_BINARY_DIR}
-target_include_directories(qbt_gui PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
+target_include_directories(qbt_gui PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
 
 target_link_libraries(qbt_gui
     PRIVATE

src/gui/customizabletoolbar.cpp

@@ -0,0 +1,297 @@
+#include "customizabletoolbar.h"
+
+#include <QAction>
+#include <QActionEvent>
+#include <QApplication>
+#include <QCursor>
+#include <QGraphicsOpacityEffect>
+#include <QLabel>
+#include <QMouseEvent>
+#include <QPixmap>
+#include <QTimer>
+
+#include "base/global.h"
+
+CustomizableToolBar::CustomizableToolBar(QWidget *parent)
+    : QToolBar(parent)
+{
+    setMouseTracking(true);
+}
+
+CustomizableToolBar::CustomizableToolBar(const QString &title, QWidget *parent)
+    : QToolBar(title, parent)
+{
+    setMouseTracking(true);
+}
+
+void CustomizableToolBar::lockAction(QAction *action)
+{
+    if (action && !m_lockedActions.contains(action))
+        m_lockedActions.append(action);
+}
+
+void CustomizableToolBar::setLocked(const bool locked)
+{
+    m_locked = locked;
+}
+
+void CustomizableToolBar::actionEvent(QActionEvent *event)
+{
+    QToolBar::actionEvent(event);
+    if (event->type() == QEvent::ActionAdded)
+    {
+        QWidget *w = widgetForAction(event->action());
+        if (w)
+            w->installEventFilter(this);
+    }
+}
+
+bool CustomizableToolBar::eventFilter(QObject *watched, QEvent *event)
+{
+    if (m_locked)
+        return QToolBar::eventFilter(watched, event);
+
+    auto *widget = qobject_cast<QWidget *>(watched);
+    if (!widget)
+        return QToolBar::eventFilter(watched, event);
+
+    switch (event->type())
+    {
+    case QEvent::MouseButtonPress:
+    {
+        m_dragJustFinished = false;
+
+        auto *me = static_cast<QMouseEvent *>(event);
+        if (me->button() != Qt::LeftButton)
+            break;
+
+        QAction *action = nullptr;
+        for (QAction *a : asConst(actions()))
+        {
+            if (widgetForAction(a) == widget)
+            {
+                action = a;
+                break;
+            }
+        }
+
+        if (!action || m_lockedActions.contains(action) || action->isSeparator())
+            break;
+
+        m_dragAction = action;
+        m_dragWidget = widget;
+        m_dragStartPos = me->globalPosition().toPoint();
+        m_dragOffsetX = me->position().toPoint().x();
+        break;
+    }
+
+    case QEvent::MouseMove:
+    {
+        if (!m_dragAction)
+            break;
+
+        auto *me = static_cast<QMouseEvent *>(event);
+        const QPoint globalPos = me->globalPosition().toPoint();
+
+        if (!m_dragging)
+        {
+            if ((globalPos - m_dragStartPos).manhattanLength() < QApplication::startDragDistance())
+                break;
+            startDrag(m_dragWidget, globalPos);
+        }
+
+        if (m_dragging)
+            return true;
+        break;
+    }
+
+    case QEvent::MouseButtonRelease:
+    {
+        if (m_dragJustFinished)
+        {
+            m_dragJustFinished = false;
+            return true;
+        }
+        if (m_dragging)
+        {
+            auto *me = static_cast<QMouseEvent *>(event);
+            endDrag(me->globalPosition().toPoint());
+            return true;
+        }
+        if (m_dragAction)
+            m_dragAction = nullptr;
+        break;
+    }
+
+    default:
+        break;
+    }
+
+    return QToolBar::eventFilter(watched, event);
+}
+
+void CustomizableToolBar::onDragTimer()
+{
+    if (!m_dragging)
+        return;
+
+    updateDrag(QCursor::pos());
+
+    if (!(QApplication::mouseButtons() & Qt::LeftButton))
+        endDrag(QCursor::pos());
+}
+
+void CustomizableToolBar::startDrag(QWidget *widget, const QPoint &globalPos)
+{
+    m_dragging = true;
+
+    // Snapshot BEFORE making transparent
+    const QPixmap snap = widget->grab();
+
+    // Make drag widget invisible but keep it in layout, avoiding reflow
+    auto *effect = new QGraphicsOpacityEffect(widget);
+    effect->setOpacity(0.0);
+    widget->setGraphicsEffect(effect);
+
+    // Float label follows cursor globally
+    m_floatLabel = new QLabel(nullptr, Qt::ToolTip | Qt::FramelessWindowHint | Qt::NoDropShadowWindowHint);
+    m_floatLabel->setAttribute(Qt::WA_TransparentForMouseEvents);
+    m_floatLabel->setAttribute(Qt::WA_ShowWithoutActivating);
+    m_floatLabel->setPixmap(snap);
+    m_floatLabel->setFixedSize(snap.size());
+    m_floatLabel->show();
+
+    m_dragTimer = new QTimer(this);
+    m_dragTimer->setInterval(16);
+    connect(m_dragTimer, &QTimer::timeout, this, &CustomizableToolBar::onDragTimer);
+    m_dragTimer->start();
+
+    updateDrag(globalPos);
+}
+
+void CustomizableToolBar::updateDrag(const QPoint &globalPos)
+{
+    if (!m_floatLabel)
+        return;
+
+    const int fw = m_floatLabel->width();
+    const int fh = m_floatLabel->height();
+    const QPoint toolbarTopLeft = mapToGlobal(QPoint(0, 0));
+    const int boundaryGX = getBoundaryGlobalX();
+
+    const int clampedX = qBound(toolbarTopLeft.x(), globalPos.x() - m_dragOffsetX, boundaryGX - fw + 20);
+    const int clampedY = toolbarTopLeft.y() + (height() - fh) / 2;
+    m_floatLabel->move(clampedX, clampedY);
+
+    const int dragFloatLeft = mapFromGlobal(QPoint(clampedX, 0)).x();
+    const int dragFloatRight = mapFromGlobal(QPoint(clampedX + fw, 0)).x();
+    const int dragFloatCentre = mapFromGlobal(QPoint(clampedX + fw / 2, 0)).x();
+    const bool atLeftWall = (clampedX <= toolbarTopLeft.x());
+    const bool movingLeft = atLeftWall || (dragFloatCentre < m_lastFloatCentreX)
+        || ((m_lastFloatCentreX == 0) && (globalPos.x() < m_dragStartPos.x()));
+    m_lastFloatCentreX = dragFloatCentre;
+
+    const int bi = findBoundaryIndex();
+    const QList<QAction *> acts = actions();
+
+    if (!acts.isEmpty() && (acts.first() == m_dragAction) && !movingLeft && (m_lastSwapX >= 0) && (qAbs(dragFloatLeft - m_lastSwapX) < 20))
+        return;
+    QAction *newInsertBefore = (bi >= 0) ? acts[bi] : nullptr;
+    for (int i = 0; i < bi; ++i)
+    {
+        QAction *a = acts[i];
+        if (a == m_dragAction)
+            continue;
+        QWidget *w = widgetForAction(a);
+        if (!w && !a->isSeparator())
+            continue;
+
+        const int threshold = w ? (a->isSeparator() ? (movingLeft ? w->x() + w->width() + fw / 2 : w->x() - fw / 2) : w->x() + w->width() / 2) : 0;
+
+        const int compareX = a->isSeparator() ? dragFloatCentre : (movingLeft ? dragFloatLeft : dragFloatRight);
+        if (compareX < threshold)
+        {
+            newInsertBefore = a;
+            break;
+        }
+    }
+
+    const bool targetIsSeparator = newInsertBefore && newInsertBefore->isSeparator();
+    if (!targetIsSeparator && (m_lastSwapX >= 0) && (qAbs(dragFloatLeft - m_lastSwapX) < 14))
+        return;
+    // Only swap when target slot changes, one atomic reorder per crossing
+    if (newInsertBefore == m_gapTarget)
+        return;
+
+    m_gapTarget = newInsertBefore;
+    m_lastSwapX = dragFloatLeft;
+
+    // Briefly remove opacity effect during reorder, reapply to new widget
+    if (m_dragWidget)
+        m_dragWidget->setGraphicsEffect(nullptr);
+
+    removeAction(m_dragAction);
+    insertAction(m_gapTarget, m_dragAction);
+
+    QWidget *newWidget = widgetForAction(m_dragAction);
+    if (newWidget)
+    {
+        m_dragWidget = newWidget;
+        auto *effect = new QGraphicsOpacityEffect(newWidget);
+        effect->setOpacity(0.0);
+        newWidget->setGraphicsEffect(effect);
+    }
+}
+
+void CustomizableToolBar::endDrag(const QPoint &globalPos)
+{
+    Q_UNUSED(globalPos)
+
+    if (m_dragTimer)
+    {
+        m_dragTimer->stop();
+        delete m_dragTimer;
+        m_dragTimer = nullptr;
+    }
+
+    delete m_floatLabel;
+    m_floatLabel = nullptr;
+
+    // Remove opacity effect, restore widget appearance
+    if (m_dragWidget)
+        m_dragWidget->setGraphicsEffect(nullptr);
+
+    // Reorder already committed live in updateDrag, just save state
+    emit actionOrderChanged();
+
+    m_gapTarget = nullptr;
+    m_lastSwapX = -1;
+    m_lastFloatCentreX = 0;
+    m_dragAction = nullptr;
+    m_dragWidget = nullptr;
+    m_dragJustFinished = true;
+    m_dragging = false;
+}
+
+int CustomizableToolBar::findBoundaryIndex() const
+{
+    const QList<QAction *> acts = actions();
+    for (int i = 0; i < acts.size(); ++i)
+    {
+        if (m_lockedActions.contains(acts[i]))
+            return i;
+    }
+    return -1;
+}
+
+int CustomizableToolBar::getBoundaryGlobalX() const
+{
+    const int bi = findBoundaryIndex();
+    if (bi >= 0)
+    {
+        QWidget *bw = widgetForAction(actions()[bi]);
+        if (bw)
+            return mapToGlobal(QPoint(bw->x(), 0)).x();
+    }
+    return mapToGlobal(QPoint(width(), 0)).x();
+}