Fix several cases of timeline losing focus

src/timeline2/view/qml/timeline.qml

@@ -1864,6 +1864,9 @@ Rectangle {
                                             timeline.showToolTip()
                                             //bubbleHelp.hide()
                                             tracksArea.focus = true
+                                            if (!dragProxyArea.containsMouse) {
+                                                regainFocus(dragProxyArea.mapToItem(root,mouseX, mouseY))
+                                            }
                                         }
                                     }
                                     onDoubleClicked: {

src/timeline2/view/timelinewidget.cpp

@@ -430,10 +430,14 @@ void TimelineWidget::slotUngrabHack()
         // Reset menu position, necessary if user closes the menu without selecting any action
         rootObject()->setProperty("clickFrame", -1);
     });
-    if (quickWindow() && quickWindow()->mouseGrabberItem()) {
-        quickWindow()->mouseGrabberItem()->ungrabMouse();
-        QPoint mousePos = mapFromGlobal(QCursor::pos());
-        QMetaObject::invokeMethod(rootObject(), "regainFocus", Qt::DirectConnection, Q_ARG(QVariant, mousePos));
+    if (quickWindow()) {
+        if (quickWindow()->mouseGrabberItem()) {
+            quickWindow()->mouseGrabberItem()->ungrabMouse();
+            QPoint mousePos = mapFromGlobal(QCursor::pos());
+            QMetaObject::invokeMethod(rootObject(), "regainFocus", Qt::DirectConnection, Q_ARG(QVariant, mousePos));
+        } else {
+            QMetaObject::invokeMethod(rootObject(), "endDrag", Qt::DirectConnection);
+        }
     }
 }
 

[Bruno Santos]

This should be great! Thank you!