[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdenlive] src: Fix Lift/Extract broken by recent change
From:       Jean-Baptiste Mardelle <jb () kdenlive ! org>
Date:       2016-04-30 14:43:21
Message-ID: E1awW77-0005SU-77 () scm ! kde ! org
[Download RAW message or body]

Git commit 8f5f90292bf95d363333dbff29bb7caec21400c7 by Jean-Baptiste Mardelle.
Committed on 30/04/2016 at 14:24.
Pushed by mardelle into branch 'master'.

Fix Lift/Extract broken by recent change
Ref: T1961

M  +2    -2    src/mainwindow.cpp
M  +2    -0    src/timeline/customtrackview.cpp

http://commits.kde.org/kdenlive/8f5f90292bf95d363333dbff29bb7caec21400c7

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 59bd131..4691aa4 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -2147,14 +2147,14 @@ void MainWindow::slotInsertClipInsert()
 void MainWindow::slotExtractZone()
 {
     if (pCore->projectManager()->currentTimeline()) {
-        pCore->projectManager()->currentTimeline()->projectView()->extractZone(m_projectMonitor->getZoneInfo(), \
true); +        pCore->projectManager()->currentTimeline()->projectView()->extractZone(QPoint(), \
true);  }
 }
 
 void MainWindow::slotLiftZone()
 {
     if (pCore->projectManager()->currentTimeline()) {
-        pCore->projectManager()->currentTimeline()->projectView()->extractZone(m_projectMonitor->getZoneInfo(),false);
 +        pCore->projectManager()->currentTimeline()->projectView()->extractZone(QPoint(),false);
  }
 }
 
diff --git a/src/timeline/customtrackview.cpp b/src/timeline/customtrackview.cpp
index 481de92..213c14c 100644
--- a/src/timeline/customtrackview.cpp
+++ b/src/timeline/customtrackview.cpp
@@ -3310,6 +3310,8 @@ void CustomTrackView::cutTimeline(int cutPos, QUndoCommand \
*masterCommand)  void CustomTrackView::extractZone(QPoint z, bool closeGap, \
QUndoCommand *masterCommand)  {
     // remove track zone and close gap
+    if (z.isNull())
+        z = m_document->zone();
     QRectF rect(z.x(), 0, z.y() - z.x() - 1, m_timeline->visibleTracksCount() * \
m_tracksHeight);  QList<QGraphicsItem *> selection = m_scene->items(rect);
     QList<QGraphicsItem *> gapSelection;


[prev in list] [next in list] [prev in thread] [next in thread]