Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Multimedia
Kdenlive
Commits
7e5dabd4
Commit
7e5dabd4
authored
May 29, 2019
by
Jean-Baptiste Mardelle
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix timeline unresponsive after deleting all clips
Fixes
#198
parent
43a5b6df
Pipeline
#3866
passed with stage
in 14 minutes and 24 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
4 deletions
+2
-4
src/timeline2/model/timelinemodel.cpp
src/timeline2/model/timelinemodel.cpp
+1
-1
src/timeline2/view/qml/timeline.qml
src/timeline2/view/qml/timeline.qml
+1
-3
No files found.
src/timeline2/model/timelinemodel.cpp
View file @
7e5dabd4
...
...
@@ -2230,7 +2230,7 @@ void TimelineModel::updateDuration()
}
if
(
duration
!=
current
)
{
// update black track length
m_blackClip
->
set
_in_and_
out
(
0
,
duration
+
TimelineModel
::
seekDuration
);
m_blackClip
->
set
(
"
out
"
,
duration
+
TimelineModel
::
seekDuration
);
emit
durationUpdated
();
}
}
...
...
src/timeline2/view/qml/timeline.qml
View file @
7e5dabd4
...
...
@@ -1096,7 +1096,6 @@ Rectangle {
drag.minimumX
:
0
property
int
dragFrame
property
bool
shiftClick
:
false
cursorShape
:
pressed
?
Qt
.
ClosedHandCursor
:
Qt
.
OpenHandCursor
enabled
:
root
.
activeTool
==
0
onPressed
:
{
console
.
log
(
'
+++++++++++++++++++ DRAG CLICKED +++++++++++++
'
)
...
...
@@ -1473,8 +1472,7 @@ Rectangle {
onPositionChanged
:
if
(
!
stopScrolling
)
Logic
.
scrollIfNeeded
()
onFrameFormatChanged
:
ruler
.
adjustFormat
()
onSelectionChanged
:
{
//cornerstone.selected = timeline.isMultitrackSelected()
if
(
dragProxy
.
draggedItem
>
-
1
&&
!
timeline
.
exists
(
dragProxy
.
draggedItem
))
{
if
(
dragProxy
.
draggedItem
>
-
1
&&
!
timeline
.
exists
(
dragProxy
.
draggedItem
)
||
timeline
.
selection
.
indexOf
(
dragProxy
.
draggedItem
)
==
-
1
)
{
endDrag
()
}
}
...
...
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