path: root/fancymainwindow.patch

diff --git a/src/libs/utils/fancymainwindow.cpp b/src/libs/utils/fancymainwindow.cpp
index 49be086a..9cf896cb 100644
--- a/src/libs/utils/fancymainwindow.cpp
+++ b/src/libs/utils/fancymainwindow.cpp
@@ -66,7 +66,7 @@ DocksAndSizes DocksAndSizes::fromMap(const QVariantMap &store, const QList<QDock
     info.sizes = store.value(kDocksAndSizesSizes).value<QList<int>>();
 
     // clean up for docks that could not be found
-    for (int i = info.docks.size() - 1; i >= 0; --i) {
+    for (int i = 0; i < info.docks.size(); ++i) {
         if (!info.docks.at(i)) {
             info.docks.removeAt(i);
             if (i < info.sizes.size())
@@ -110,6 +110,12 @@ public:
 
     QVariant saveState() const;
     void restoreState(const QVariant &data);
+    
+    bool eventFilter(QObject *, QEvent *event) override;
+    void enterEvent(QEnterEvent *event) override;
+    void leaveEvent(QEvent *event) override;
+    void handleMouseTimeout();
+    void handleToplevelChanged(bool floating);
 
     FancyMainWindow *q;
 
@@ -117,7 +123,7 @@ signals:
     void collapseChanged();
 
 protected:
-    bool event(QEvent *event) final
+    bool event(QEvent *event)
     {
         switch (event->type()) {
         case QEvent::MouseButtonDblClick:
@@ -149,6 +155,9 @@ private:
     QWidget *m_hiddenInnerWidget = nullptr;
     int m_hiddenInnerWidgetHeight = 0;
     TitleBarWidget *m_titleBar;
+    QTimer m_timer;
+    QPoint m_startPos;
+
 };
 
 // Stolen from QDockWidgetTitleButton
@@ -215,30 +224,19 @@ void DockWidgetTitleButton::paintEvent(QPaintEvent *)
     style()->drawComplexControl(QStyle::CC_ToolButton, &opt, &p, this);
 }
 
-class TitleBarWidget : public StyledBar
+class TitleBarWidget : public QWidget
 {
 public:
-    TitleBarWidget(DockWidget *parent)
-        : StyledBar(parent)
-        , q(parent)
+    TitleBarWidget(DockWidget *parent, const QStyleOptionDockWidget &opt)
+      : QWidget(parent), q(parent), m_active(true)
     {
         m_titleLabel = new QLabel(this);
 
-        m_collapseButton = new DockWidgetTitleButton(this);
-        updateCollapse();
-        connect(m_collapseButton,
-                &DockWidgetTitleButton::clicked,
-                this,
-                &TitleBarWidget::toggleCollapse);
-        connect(q->q, &FancyMainWindow::dockWidgetsChanged, this, &TitleBarWidget::updateCollapse);
-        connect(q, &DockWidget::collapseChanged, this, &TitleBarWidget::updateCollapse);
-
         m_floatButton = new DockWidgetTitleButton(this);
-        m_floatButton->setIcon(
-            Icon({{":/utils/images/app-on-top.png", Theme::IconsBaseColor}}).icon());
+        m_floatButton->setIcon(q->style()->standardIcon(QStyle::SP_TitleBarNormalButton, &opt, q));
 
         m_closeButton = new DockWidgetTitleButton(this);
-        m_closeButton->setIcon(Icons::CLOSE_TOOLBAR.icon());
+        m_closeButton->setIcon(q->style()->standardIcon(QStyle::SP_TitleBarCloseButton, &opt, q));
 
 #ifndef QT_NO_ACCESSIBILITY
         m_floatButton->setAccessibleName(QDockWidget::tr("Float"));
@@ -247,33 +245,39 @@ public:
         m_closeButton->setAccessibleDescription(QDockWidget::tr("Closes the dock widget"));
 #endif
 
+        setActive(false);
+
+        const int minWidth = 10;
+        const int maxWidth = 10000;
+        const int inactiveHeight = 0;
+        const int activeHeight = m_closeButton->sizeHint().height() + 2;
+
+        m_minimumInactiveSize = QSize(minWidth, inactiveHeight);
+        m_maximumInactiveSize = QSize(maxWidth, inactiveHeight);
+        m_minimumActiveSize   = QSize(minWidth, activeHeight);
+        m_maximumActiveSize   = QSize(maxWidth, activeHeight);
+
         auto layout = new QHBoxLayout(this);
         layout->setSpacing(0);
         layout->setContentsMargins(4, 0, 0, 0);
-        layout->addWidget(m_collapseButton);
         layout->addWidget(m_titleLabel);
         layout->addStretch();
         layout->addWidget(m_floatButton);
         layout->addWidget(m_closeButton);
         setLayout(layout);
 
-        m_closeButton->setVisible(false);
-        m_floatButton->setVisible(false);
-        connect(parent, &QDockWidget::featuresChanged, this, [this] { updateChildren(); });
+        setProperty("managed_titlebar", 1);
+
+        connect(parent, &QDockWidget::featuresChanged, this, [this, parent] {
+            m_closeButton->setVisible(parent->features().testFlag(QDockWidget::DockWidgetClosable));
+            m_floatButton->setVisible(parent->features().testFlag(QDockWidget::DockWidgetFloatable));
+        });
     }
 
     void enterEvent(QEnterEvent *event) override
     {
-        m_hovered = true;
+        setActive(true);
         QWidget::enterEvent(event);
-        updateChildren();
-    }
-
-    void leaveEvent(QEvent *event) override
-    {
-        m_hovered = false;
-        QWidget::leaveEvent(event);
-        updateChildren();
     }
 
     void setActive(bool on)
@@ -284,52 +288,47 @@ public:
 
     void updateChildren()
     {
-        setVisible(m_active);
-        m_floatButton->setVisible(m_hovered
+        bool clickable = isClickable();
+        m_titleLabel->setVisible(clickable);
+
+        m_floatButton->setVisible(clickable
                                   && q->features().testFlag(QDockWidget::DockWidgetFloatable));
-        m_closeButton->setVisible(m_hovered
+        m_closeButton->setVisible(clickable
                                   && q->features().testFlag(QDockWidget::DockWidgetClosable));
-        updateCollapse();
     }
 
-    QSize sizeHint() const override
+    bool isClickable() const
     {
-        ensurePolished();
-        return m_active ? QSize(titleMaxWidth, StyledBar::minimumHeight())
-                        : QSize(titleMaxWidth, titleInactiveHeight);
+        return m_active;
     }
 
-    QSize minimumSizeHint() const override
+    QSize sizeHint() const override
     {
         ensurePolished();
-        return m_active ? QSize(titleMinWidth, StyledBar::minimumHeight())
-                        : QSize(titleMinWidth, titleInactiveHeight);
+        return isClickable() ? m_maximumActiveSize : m_maximumInactiveSize;
     }
 
-    void toggleCollapse() { q->setCollapsed(!q->isCollapsed()); }
-
-    void updateCollapse()
+    QSize minimumSizeHint() const override
     {
-        const bool supported = q->supportsCollapse();
-        m_collapseButton->setVisible(supported);
-        if (q->isCollapsed())
-            m_collapseButton->setIcon(Icons::NEXT_TOOLBAR.icon());
-        else
-            m_collapseButton->setIcon(Icons::ARROW_DOWN_TOOLBAR.icon());
+        ensurePolished();
+        return isClickable() ? m_minimumActiveSize : m_minimumInactiveSize;
     }
 
 private:
     DockWidget *q;
-    bool m_active = true;
-    bool m_hovered = false;
+    bool m_active;
+    QSize m_minimumActiveSize;
+    QSize m_maximumActiveSize;
+    QSize m_minimumInactiveSize;
+    QSize m_maximumInactiveSize;
 
 public:
     QLabel *m_titleLabel;
-    DockWidgetTitleButton *m_collapseButton;
     DockWidgetTitleButton *m_floatButton;
     DockWidgetTitleButton *m_closeButton;
 };
 
+
 DockWidget::DockWidget(QWidget *inner, FancyMainWindow *parent, bool immutable)
     : QDockWidget(parent)
     , q(parent)
@@ -344,7 +343,9 @@ DockWidget::DockWidget(QWidget *inner, FancyMainWindow *parent, bool immutable)
     title = stripAccelerator(title);
     setWindowTitle(title);
 
-    m_titleBar = new TitleBarWidget(this);
+    QStyleOptionDockWidget opt;
+    initStyleOption(&opt);
+    m_titleBar = new TitleBarWidget(this, opt);
     m_titleBar->m_titleLabel->setText(title);
     setTitleBarWidget(m_titleBar);
 
@@ -353,10 +354,13 @@ DockWidget::DockWidget(QWidget *inner, FancyMainWindow *parent, bool immutable)
         return;
     }
 
-    QPalette p = palette();
-    p.setColor(QPalette::Window, creatorColor(Theme::Token_Stroke_Subtle));
-    setPalette(p);
+    m_timer.setSingleShot(true);
+    m_timer.setInterval(500);
+
+    connect(&m_timer, &QTimer::timeout, this, &DockWidget::handleMouseTimeout);
+    connect(this, &QDockWidget::topLevelChanged, this, &DockWidget::handleToplevelChanged);
 
+    m_titleBar->setActive(false);
     connect(toggleViewAction(), &QAction::triggered, this, [this] {
         if (isVisible())
             raise();
@@ -480,6 +484,49 @@ void DockWidget::setCollapsed(bool collapse)
     emit collapseChanged();
 }
 
+bool DockWidget::eventFilter(QObject *, QEvent *event)
+{
+    if (event->type() == QEvent::MouseMove) {
+        auto me = static_cast<QMouseEvent *>(event);
+        int y = me->pos().y();
+        int x = me->pos().x();
+        int h = qMin(8, m_titleBar->m_floatButton->height());
+        if (!isFloating() && widget() && 0 <= x && x < widget()->width() && 0 <= y && y <= h) {
+            m_timer.start();
+            m_startPos = mapToGlobal(me->pos());
+        }
+    }
+    return false;
+}
+
+void DockWidget::enterEvent(QEnterEvent *event)
+{
+    QApplication::instance()->installEventFilter(this);
+    QDockWidget::enterEvent(event);
+}
+
+void DockWidget::leaveEvent(QEvent *event)
+{
+    if (!isFloating()) {
+        m_timer.stop();
+        m_titleBar->setActive(false);
+    }
+    QApplication::instance()->removeEventFilter(this);
+    QDockWidget::leaveEvent(event);
+}
+
+void DockWidget::handleMouseTimeout()
+{
+    QPoint dist = m_startPos - QCursor::pos();
+    if (!isFloating() && dist.manhattanLength() < 4)
+        m_titleBar->setActive(true);
+}
+
+void DockWidget::handleToplevelChanged(bool floating)
+{
+    m_titleBar->setActive(floating);
+}
+
 const char kDockWidgetInnerWidgetHeight[] = "InnerWidgetHeight";
 
 QVariant DockWidget::saveState() const
@@ -590,7 +637,6 @@ FancyMainWindow::FancyMainWindow(QWidget *parent) :
 FancyMainWindow::~FancyMainWindow()
 {
     delete d;
-    d = nullptr;
 }
 
 QDockWidget *FancyMainWindow::addDockForWidget(QWidget *widget, bool immutable)
@@ -627,18 +673,6 @@ QDockWidget *FancyMainWindow::addDockForWidget(QWidget *widget, bool immutable)
         connect(dockWidget, &QDockWidget::dockLocationChanged, this, handleDockWidgetChanged);
         connect(dockWidget, &QDockWidget::topLevelChanged, this, handleDockWidgetChanged);
         connect(dockWidget, &QDockWidget::visibilityChanged, this, handleDockWidgetChanged);
-        connect(dockWidget, &QDockWidget::destroyed, this, [this](QObject *dock) {
-            if (!d)
-                return;
-            for (DocksAndSizes &hiddenDocks : d->m_hiddenAreas) {
-                const int i = hiddenDocks.docks.indexOf(static_cast<QDockWidget *>(dock));
-                if (i >= 0) {
-                    hiddenDocks.docks.removeAt(i);
-                    if (i < hiddenDocks.sizes.size())
-                        hiddenDocks.sizes.removeAt(i);
-                }
-            }
-        });
     }
 
     return dockWidget;
@@ -804,13 +838,7 @@ void FancyMainWindow::setDockAreaVisible(Qt::DockWidgetArea area, bool visible)
     } else {
         const QList<QDockWidget *> docks = docksInArea(area);
         if (!docks.isEmpty()) {
-            const Qt::Orientation orientation = orientationForArea(area);
-            const auto sizeForDock = [orientation](QDockWidget *w) {
-                if (orientation == Qt::Vertical)
-                    return w->height();
-                return w->width();
-            };
-            const QList<int> sizes = transform(docks, sizeForDock);
+            const QList<int> sizes = transform(docks, [](QDockWidget *w) { return w->height(); });
             d->m_hiddenAreas.insert(area, DocksAndSizes{docks, sizes});
             for (QDockWidget *w : docks)
                 w->setVisible(false);