Commit 77c08c99 authored by luyikei's avatar luyikei

Workflow: Change ordering of the arguments of moveClip

parent b81d4022
......@@ -183,7 +183,7 @@ Rectangle {
if ( !clip )
return;
clip.position = position;
workflow.moveClip( trackId, uuid, position );
workflow.moveClip( uuid, trackId, position );
}
function adjustTracks( trackType ) {
......@@ -289,6 +289,12 @@ Rectangle {
// Never show the background behind the timeline
if ( newContentX >= 0 && sView.flickableItem.contentWidth - newContentX > sView.width )
sView.flickableItem.contentX = newContentX;
if ( ratio > 1 )
scale++;
else
scale--;
mainwindow.setScale( scale );
}
function dragFinished() {
......
......@@ -226,7 +226,7 @@ MainWorkflow::clipInfo( const QString& uuid )
}
void
MainWorkflow::moveClip( quint32 trackId, const QString& uuid, qint64 startFrame )
MainWorkflow::moveClip( const QString& uuid, quint32 trackId, qint64 startFrame )
{
for ( auto it = m_clips.begin(); it != m_clips.end(); ++it )
{
......
......@@ -149,7 +149,7 @@ class MainWorkflow : public QObject
QJsonObject clipInfo( const QString& uuid );
Q_INVOKABLE
void moveClip( quint32 trackId, const QString& uuid, qint64 startFrame );
void moveClip( const QString& uuid, quint32 trackId, qint64 startFrame );
Q_INVOKABLE
void resizeClip( const QString& uuid, qint64 newBegin,
......
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