Fix painting issues with timeline cursor

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

diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp
index 52630d337586fab5749e6b17336b6bf180080c52..22af7b56ccc6fdba2b100df8a0ad407be9ef6bb1 100644 (file)
--- a/src/customtrackview.cpp
+++ b/src/customtrackview.cpp
@@ -138,10 +138,12 @@ CustomTrackView::CustomTrackView(KdenliveDoc *doc, CustomTrackScene* projectscen
     verticalScrollBar()->setMaximum(maxHeight);
     m_cursorLine = projectscene->addLine(0, 0, 0, maxHeight);
     m_cursorLine->setZValue(1000);
-    /*QPen pen1;
-    pen1.setWidthF(0);
-    pen1.setCosmetic(true);
-    m_cursorLine->setPen(pen1);*/
+    
+    QPen pen1 = QPen();
+    pen1.setWidth(1);
+    pen1.setColor(Qt::black);
+    m_cursorLine->setPen(pen1);
+    m_cursorLine->setFlag(QGraphicsItem::ItemIgnoresTransformations, true);
 
     KIcon razorIcon("edit-cut");
     m_razorCursor = QCursor(razorIcon.pixmap(22, 22));
@@ -795,7 +797,9 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event)
             }
             groupSelectedItems(true);
             m_operationMode = SPACER;
-        } else setCursorPos((int)(mapToScene(event->x(), 0).x()));
+        } else {
+            setCursorPos((int)(mapToScene(event->x(), 0).x()));
+        }
         QGraphicsView::mousePressEvent(event);
         return;
     }

diff --git a/src/guide.cpp b/src/guide.cpp
index 2f40ebbbfe0638aa008b7629b9cf7e4e25592211..58cf9e9a358979811cc953024f3e8652b00fc91a 100644 (file)
--- a/src/guide.cpp
+++ b/src/guide.cpp
@@ -35,7 +35,7 @@ Guide::Guide(CustomTrackView *view, GenTime pos, QString label, double fps, doub
         m_view(view),
         m_pen(QPen())
 {
-    setFlags(QGraphicsItem::ItemIsMovable);
+    setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIgnoresTransformations);
     setToolTip(label);
     setLine(0, 0, 0, height);
     setPos(m_position.frames(m_fps), 0);
@@ -144,8 +144,8 @@ void Guide::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWi
 {
     QGraphicsLineItem::paint(painter, option);
     if (KdenliveSettings::showmarkers()) {
-        painter->setMatrixEnabled(false);
-        QPointF p1 = painter->matrix().map(line()).p1() + QPointF(1, 0);
+        //QPointF p1 = painter->matrix().map(line()).p1() + QPointF(1, 0);
+        QPointF p1 = line().p1() + QPointF(1, 0);
         const QFontMetrics metric = m_view->fontMetrics();
         QRectF txtBounding = painter->boundingRect(p1.x(), p1.y() + 10, m_width, metric.height(), Qt::AlignLeft | Qt::AlignTop, ' ' + m_label + ' ');
         QPainterPath path;
@@ -153,7 +153,6 @@ void Guide::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWi
         painter->fillPath(path, m_pen.color());
         painter->setPen(Qt::white);
         painter->drawText(txtBounding, Qt::AlignCenter, m_label);
-        painter->setMatrixEnabled(true);
     }
 }