activate monitor when clicking in timeline + small renderer update

[kdenlive] / src / trackview.cpp

diff --git a/src/trackview.cpp b/src/trackview.cpp
index bbf2c464052a28ad07fd3df16eee1903a1f76ed2..ee9672c4d584128a4913266483711819ac61de0d 100644 (file)
--- a/src/trackview.cpp
+++ b/src/trackview.cpp
@@ -31,7 +31,7 @@
 
 TrackView::TrackView(KdenliveDoc *doc, QWidget *parent)
         : QWidget(parent), m_doc(doc), m_scale(1.0), m_projectTracks(0), m_projectDuration(0) {
-    setMouseTracking(true);
+
     view = new Ui::TimeLine_UI();
     view->setupUi(this);
 
@@ -44,6 +44,10 @@ TrackView::TrackView(KdenliveDoc *doc, QWidget *parent)
     m_ruler = new CustomRuler(doc->timecode(), m_trackview);
     QVBoxLayout *layout = new QVBoxLayout;
     view->ruler_frame->setLayout(layout);
+    int left_margin;
+    int right_margin;
+    layout->getContentsMargins(&left_margin, 0, &right_margin, 0);
+    layout->setContentsMargins(left_margin, 0, right_margin, 0);
     layout->addWidget(m_ruler);
 
     m_headersLayout = new QVBoxLayout;
@@ -81,6 +85,14 @@ int TrackView::tracksNumber() {
     return m_projectTracks;
 }
 
+int TrackView::inPoint() {
+    return m_ruler->inPoint();
+}
+
+int TrackView::outPoint() {
+    return m_ruler->outPoint();
+}
+
 void TrackView::slotClipItemSelected(ClipItem*c) {
     emit clipItemSelected(c);
 }
@@ -116,21 +128,19 @@ void TrackView::slotDeleteClip(int clipId) {
 }
 
 void TrackView::setCursorPos(int pos) {
-    m_trackview->setCursorPos(pos * m_scale);
+    m_trackview->setCursorPos(pos);
 }
 
 void TrackView::moveCursorPos(int pos) {
-    m_trackview->setCursorPos(pos * m_scale, false);
+    m_trackview->setCursorPos(pos, false);
 }
 
 void TrackView::slotChangeZoom(int factor) {
-    double pos = m_trackview->cursorPos() / m_scale;
+
     m_ruler->setPixelPerMark(factor);
     m_scale = (double) FRAME_SIZE / m_ruler->comboScale[factor]; // m_ruler->comboScale[m_currentZoom] /
     m_currentZoom = factor;
     m_trackview->setScale(m_scale);
-    m_trackview->setCursorPos(pos * m_scale, false);
-    m_trackview->centerOn(QPointF(m_trackview->cursorPos(), 50));
 }
 
 const double TrackView::zoomFactor() const {