Merge pull request #29538 from mathesoncalum/460_porting_2

Porting more PRs to 4.6.0

Author: RomanPudashkin

src/framework/dockwindow/internal/docktabbar.cpp

@@ -37,28 +37,48 @@ bool DockTabBar::event(QEvent* event)
         doubleClicked(mouseEvent->pos());
         return true;
     }
-    case QEvent::MouseButtonPress: {
-        QQuickItem* tabBar = tabBarQmlItem();
-        if (tabBar) {
-            QMouseEvent* mouseEvent = static_cast<QMouseEvent*>(event);
-            QPoint localPos = mouseEvent->pos();
+    case QEvent::MouseButtonPress:
+    case QEvent::MouseButtonRelease: {
+        QMouseEvent* mouseEvent = static_cast<QMouseEvent*>(event);
+        onMousePressRelease(mouseEvent);
+        return true;
+    }
+    default:
+        break;
+    }
 
-            int tabIndex = tabAt(localPos);
-            if (tabIndex < 0) {
-                return true;
-            }
+    return KDDockWidgets::TabBarQuick::event(event);
+}
 
-            tabBar->setProperty("currentIndex", tabIndex);
-            TabBar::onMousePress(localPos);
-        }
+void DockTabBar::onMousePressRelease(const QMouseEvent* mouseEvent)
+{
+    QQuickItem* tabBar = tabBarQmlItem();
+    if (!mouseEvent || !tabBar) {
+        return;
+    }
+
+    const QPoint localPos = mouseEvent->pos();
+
+    int tabIndex = tabAt(localPos);
+    if (tabIndex < 0) {
+        return;
+    }
 
+    switch (mouseEvent->type()) {
+    case QEvent::MouseButtonPress: {
+        m_indexOfPressedTab = tabIndex;
+        TabBar::onMousePress(localPos);
         break;
     }
-    default:
+    case QEvent::MouseButtonRelease: {
+        if (tabIndex == m_indexOfPressedTab) {
+            tabBar->setProperty("currentIndex", tabIndex);
+        }
+        m_indexOfPressedTab = -1;
         break;
     }
-
-    return KDDockWidgets::TabBarQuick::event(event);
+    default: UNREACHABLE;
+    }
 }
 
 void DockTabBar::doubleClicked(const QPoint& pos) const

src/framework/dockwindow/internal/docktabbar.h

@@ -40,9 +40,11 @@ class DockTabBar : public KDDockWidgets::TabBarQuick
 
 private:
     bool event(QEvent* event) override;
+    void onMousePressRelease(const QMouseEvent* mouseEvent);
     bool isPositionDraggable(QPoint localPos) const override;
 
     QQuickItem* m_draggableMouseArea = nullptr;
+    int m_indexOfPressedTab = -1;
 };
 }
 

src/framework/dockwindow/qml/Muse/Dock/DockFrame.qml

@@ -95,8 +95,6 @@ Rectangle {
 
         titleBarCpp: root.titleBarCpp
 
-        contextMenuModel: prv.tabsModel.data(prv.tabsModel.index(prv.currentIndex, 0), DockTabsModel.ContextMenu)
-
         navigationPanel: navPanel
         navigationOrder: 1
 
@@ -105,6 +103,18 @@ Rectangle {
         }
 
         titleBarItem: frameModel.titleBar
+
+        function updateContextMenu() {
+            const idx = prv.tabsModel.index(prv.currentIndex, 0);
+            const menuModel = prv.tabsModel.data(idx, DockTabsModel.ContextMenu)
+            titleBar.contextMenuModel = menuModel
+        }
+
+        Connections {
+            target: prv.tabsModel
+            function onDataChanged() { titleBar.updateContextMenu() }
+            function onModelReset() { titleBar.updateContextMenu() }
+        }
     }
 
     DockTabBar {