Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Kdenlive
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
260
Issues
260
List
Boards
Labels
Service Desk
Milestones
Merge Requests
14
Merge Requests
14
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Multimedia
Kdenlive
Commits
efad2514
Commit
efad2514
authored
May 14, 2020
by
Jean-Baptiste Mardelle
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix moving single clip in group on another track with meta
Related to
#382
parent
a06cd10c
Pipeline
#20185
passed with stage
in 9 minutes and 31 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
17 deletions
+8
-17
src/timeline2/model/timelinemodel.cpp
src/timeline2/model/timelinemodel.cpp
+8
-17
No files found.
src/timeline2/model/timelinemodel.cpp
View file @
efad2514
...
...
@@ -1525,7 +1525,7 @@ bool TimelineModel::requestGroupMove(int itemId, int groupId, int delta_track, i
if
(
!
upperTrackIsAudio
)
{
// Dragging an audio clip up, check that upper video clip has an available video track
int
targetPos
=
upperTrack
-
delta_track
;
if
(
targetPos
<
0
||
getTrackById_const
(
getTrackIndexFromPosition
(
targetPos
))
->
isAudioTrack
(
))
{
if
(
moveMirrorTracks
&&
(
targetPos
<
0
||
getTrackById_const
(
getTrackIndexFromPosition
(
targetPos
))
->
isAudioTrack
()
))
{
delta_track
=
0
;
}
}
else
{
...
...
@@ -1537,7 +1537,6 @@ bool TimelineModel::requestGroupMove(int itemId, int groupId, int delta_track, i
}
}
}
if
(
delta_track
==
0
&&
updateView
)
{
updateView
=
false
;
allowViewRefresh
=
false
;
...
...
@@ -1586,23 +1585,13 @@ bool TimelineModel::requestGroupMove(int itemId, int groupId, int delta_track, i
old_forced_track
[
item
.
first
]
=
m_allCompositions
[
item
.
first
]
->
getForcedTrack
();
}
}
if
(
!
moveMirrorTracks
)
{
if
(
masterIsAudio
)
{
// Master clip is audio, so reverse delta for video clips
video_delta
=
0
;
}
else
{
audio_delta
=
0
;
}
if
(
masterIsAudio
)
{
// Master clip is audio, so reverse delta for video clips
video_delta
=
-
delta_track
;
}
else
{
if
(
masterIsAudio
)
{
// Master clip is audio, so reverse delta for video clips
video_delta
=
-
delta_track
;
}
else
{
audio_delta
=
-
delta_track
;
}
audio_delta
=
-
delta_track
;
}
}
// We need to insert depending on the move direction to avoid confusing the view
// std::reverse(std::begin(sorted_clips), std::end(sorted_clips));
bool
updateThisView
=
allowViewRefresh
;
...
...
@@ -1686,8 +1675,10 @@ bool TimelineModel::requestGroupMove(int itemId, int groupId, int delta_track, i
int
current_track_id
=
old_track_ids
[
item
.
first
];
int
current_track_position
=
getTrackPosition
(
current_track_id
);
int
d
=
getTrackById
(
current_track_id
)
->
isAudioTrack
()
?
audio_delta
:
video_delta
;
if
(
!
moveMirrorTracks
&&
item
.
first
!=
itemId
)
{
d
=
0
;
}
int
target_track_position
=
current_track_position
+
d
;
if
(
target_track_position
>=
0
&&
target_track_position
<
getTracksCount
())
{
auto
it
=
m_allTracks
.
cbegin
();
std
::
advance
(
it
,
target_track_position
);
...
...
Eugen Mohr
@emohr
mentioned in issue
#507 (closed)
·
May 15, 2020
mentioned in issue
#507 (closed)
mentioned in issue #507
Toggle commit list
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