Fix render zone not always saved / set

svn path=/trunk/kdenlive/; revision=4891

diff --git a/src/customruler.cpp b/src/customruler.cpp
index 994803b721c43d14499b2ac86a5d0ee7e11aeb83..98baa6372c3f7a7f54af763bec936f393d40c9f6 100644 (file)
--- a/src/customruler.cpp
+++ b/src/customruler.cpp
@@ -122,7 +122,12 @@ void CustomRuler::setZone(QPoint p)
 
 void CustomRuler::mouseReleaseEvent(QMouseEvent * /*event*/)
 {
+    if (m_moveCursor == RULER_START || m_moveCursor == RULER_END || m_moveCursor == RULER_MIDDLE) {
+        emit zoneMoved(m_zoneStart, m_zoneEnd);
+        m_view->setDocumentModified();
+    }
     m_mouseMove = NO_MOVE;
+
 }
 
 // virtual
@@ -189,8 +194,6 @@ void CustomRuler::mouseMoveEvent(QMouseEvent * event)
             m_zoneStart += move;
             m_zoneEnd += move;
         }
-        emit zoneMoved(m_zoneStart, m_zoneEnd);
-        m_view->setDocumentModified();
 
         int min = qMin(m_zoneStart, zoneStart);
         int max = qMax(m_zoneEnd, zoneEnd);

diff --git a/src/trackview.cpp b/src/trackview.cpp
index 0e8a8c1857a34ac05f0c98ce3c9b4e2e837c9148..5333eb0e325bc04aaede201fa2d73e99815d09a4 100644 (file)
--- a/src/trackview.cpp
+++ b/src/trackview.cpp
@@ -117,7 +117,7 @@ TrackView::TrackView(KdenliveDoc *doc, bool *ok, QWidget *parent) :
     connect(m_trackview, SIGNAL(doTrackLock(int, bool)), this, SLOT(slotChangeTrackLock(int, bool)));
 
     slotChangeZoom(m_doc->zoom().x(), m_doc->zoom().y());
-    slotSetZone(m_doc->zone());
+    slotSetZone(m_doc->zone(), false);
 }
 
 TrackView::~TrackView()
@@ -173,9 +173,10 @@ int TrackView::outPoint() const
     return m_ruler->outPoint();
 }
 
-void TrackView::slotSetZone(QPoint p)
+void TrackView::slotSetZone(QPoint p, bool updateDocumentProperties)
 {
     m_ruler->setZone(p);
+    if (updateDocumentProperties) m_doc->setZone(p.x(), p.y());
 }
 
 void TrackView::setDuration(int dur)

diff --git a/src/trackview.h b/src/trackview.h
index d5d1eb41252cfe64807a13a51d63390a4fa4d885..e3fecfccd9c4d78d4291bcc1831afbead21229e0 100644 (file)
--- a/src/trackview.h
+++ b/src/trackview.h
@@ -83,7 +83,7 @@ public slots:
     void slotDeleteClip(const QString &clipId);
     void slotChangeZoom(int horizontal, int vertical = -1);
     void setDuration(int dur);
-    void slotSetZone(QPoint p);
+    void slotSetZone(QPoint p, bool updateDocumentProperties = true);
 
 private:
     CustomRuler *m_ruler;