Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Multimedia
Kdenlive
Commits
b6731517
Commit
b6731517
authored
Apr 07, 2022
by
Jean-Baptiste Mardelle
Browse files
Fix several cases of timeline losing focus
parent
62cf0613
Pipeline
#160751
passed with stage
in 13 minutes and 15 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/timeline2/view/qml/timeline.qml
View file @
b6731517
...
...
@@ -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
View file @
b6731517
...
...
@@ -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
@bsantos
·
Apr 07, 2022
Reporter
This should be great! Thank you!
This should be great! Thank you!
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment