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
261
Issues
261
List
Boards
Labels
Service Desk
Milestones
Merge Requests
15
Merge Requests
15
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
1f9d298e
Commit
1f9d298e
authored
Feb 28, 2020
by
Jean-Baptiste Mardelle
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix track tag name not updated on track insert/delete
parent
27dd6c19
Pipeline
#15744
passed with stage
in 13 minutes and 50 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
22 additions
and
0 deletions
+22
-0
src/timeline2/model/timelinemodel.cpp
src/timeline2/model/timelinemodel.cpp
+22
-0
No files found.
src/timeline2/model/timelinemodel.cpp
View file @
1f9d298e
...
...
@@ -2274,7 +2274,17 @@ bool TimelineModel::requestTrackInsertion(int position, int &id, const QString &
}
return
true
;
};
Fun
local_name_update
=
[
position
,
this
]()
{
for
(
int
i
=
position
;
i
<
getTracksCount
();
i
++
)
{
QModelIndex
ix
=
makeTrackIndexFromID
(
getTrackIndexFromPosition
(
i
));
emit
dataChanged
(
ix
,
ix
,
{
TimelineModel
::
TrackTagRole
});
}
return
true
;
};
local_update
();
local_name_update
();
Fun
rebuild_compositing
=
[
this
]()
{
buildTrackCompositing
(
true
);
return
true
;
...
...
@@ -2296,7 +2306,9 @@ bool TimelineModel::requestTrackInsertion(int position, int &id, const QString &
if
(
addCompositing
)
{
PUSH_LAMBDA
(
rebuild_compositing
,
local_undo
);
}
PUSH_LAMBDA
(
local_name_update
,
local_undo
);
UPDATE_UNDO_REDO
(
local_redo
,
local_undo
,
undo
,
redo
);
PUSH_LAMBDA
(
local_name_update
,
redo
);
return
true
;
}
...
...
@@ -2361,12 +2373,22 @@ bool TimelineModel::requestTrackDeletion(int trackId, Fun &undo, Fun &redo)
buildTrackCompositing
(
true
);
return
true
;
};
Fun
local_name_update
=
[
old_position
,
this
]()
{
for
(
int
i
=
old_position
;
i
<
getTracksCount
();
i
++
)
{
QModelIndex
ix
=
makeTrackIndexFromID
(
getTrackIndexFromPosition
(
i
));
emit
dataChanged
(
ix
,
ix
,
{
TimelineModel
::
TrackTagRole
});
}
return
true
;
};
if
(
operation
())
{
rebuild_compositing
();
local_name_update
();
PUSH_LAMBDA
(
rebuild_compositing
,
local_undo
);
PUSH_LAMBDA
(
local_name_update
,
local_undo
);
UPDATE_UNDO_REDO
(
operation
,
reverse
,
local_undo
,
local_redo
);
UPDATE_UNDO_REDO
(
local_redo
,
local_undo
,
undo
,
redo
);
PUSH_LAMBDA
(
rebuild_compositing
,
redo
);
PUSH_LAMBDA
(
local_name_update
,
redo
);
return
true
;
}
local_undo
();
...
...
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