Skip to content

GitLab

Commit 71b670df authored by Jean-Baptiste Mardelle's avatar Jean-Baptiste Mardelle
Browse files
Options

Fix focus on item under mouse after switching back from another app

parent 7a6af178
Pipeline #52931 passed with stage
    in 11 minutes and 53 seconds
    Hide whitespace changes
    Inline Side-by-side
    Showing with 2 additions and 2 deletions
    src/timeline2/view/qml/timeline.qml
    View file @ 71b670df
    ......@@ -290,8 +290,8 @@ Rectangle {
    function regainFocus(mousePos) {
    var currentMouseTrack = Logic.getTrackIdFromPos(mousePos.y - ruler.height - subtitleTrack.height + scrollView.contentY)
    // Try to find correct item
    console.log('checking item on TK: ', currentMouseTrack, ' AT: ', mousePos, ' SCROLL POS: ', (mousePos.y - ruler.height - subtitleTrack.height + scrollView.contentY))
    var tentativeClip = getItemAtPos(currentMouseTrack, mousePos.x - trackHeaders.width, dragProxy.isComposition)
    //console.log('checking item on TK: ', currentMouseTrack, ' AT: XPOS', (mousePos.x - trackHeaders.width), ', SCOLL:', scrollView.contentX, ', RES: ', ((mousePos.x - trackHeaders.width + scrollView.contentX) / timeline.scaleFactor), ' SCROLL POS: ', (mousePos.y - ruler.height - subtitleTrack.height + scrollView.contentY))
    var tentativeClip = getItemAtPos(currentMouseTrack, mousePos.x - trackHeaders.width + scrollView.contentX, dragProxy.isComposition)
    if (tentativeClip && tentativeClip.clipId) {
    dragProxy.draggedItem = tentativeClip.clipId
    var tk = controller.getItemTrackId(tentativeClip.clipId)
    ......
    Markdown is supported
    0% or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment