X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fguide.cpp;h=ba05ec6aef126841aa744ae0cbe494b013b5c1d9;hb=56aee6aedeeed3efd10ada8fe3c229eddc01ef05;hp=2f40ebbbfe0638aa008b7629b9cf7e4e25592211;hpb=80ffbcaa1c48929abe0cb439eaea4deb0ecce534;p=kdenlive

diff --git a/src/guide.cpp b/src/guide.cpp
index 2f40ebbb..ba05ec6a 100644
--- a/src/guide.cpp
+++ b/src/guide.cpp
@@ -26,19 +26,24 @@
 #include <QPen>
 #include <QBrush>
 #include <QStyleOptionGraphicsItem>
+#include <QGraphicsView>
+#include <QScrollBar>
 
-Guide::Guide(CustomTrackView *view, GenTime pos, QString label, double fps, double height) :
+Guide::Guide(CustomTrackView *view, const GenTime &pos, const QString &label, double height) :
         QGraphicsLineItem(),
         m_position(pos),
         m_label(label),
-        m_fps(fps),
         m_view(view),
         m_pen(QPen())
 {
-    setFlags(QGraphicsItem::ItemIsMovable);
+    setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIgnoresTransformations);
+#if QT_VERSION >= 0x040600
+    setFlag(QGraphicsItem::ItemSendsGeometryChanges, true);
+#endif
     setToolTip(label);
     setLine(0, 0, 0, height);
-    setPos(m_position.frames(m_fps), 0);
+    if (m_position < GenTime()) m_position = GenTime();
+    setPos(m_position.frames(m_view->fps()), 0);
     m_pen.setWidthF(0);
     m_pen.setColor(QColor(0, 0, 200, 180));
     //m_pen.setCosmetic(true);
@@ -65,10 +70,10 @@ CommentedTime Guide::info() const
     return CommentedTime(m_position, m_label);
 }
 
-void Guide::updateGuide(const GenTime newPos, const QString &comment)
+void Guide::updateGuide(const GenTime &newPos, const QString &comment)
 {
     m_position = newPos;
-    setPos(m_position.frames(m_fps), 0);
+    setPos(m_position.frames(m_view->fps()), 0);
     if (!comment.isEmpty()) {
         m_label = comment;
         setToolTip(m_label);
@@ -78,6 +83,11 @@ void Guide::updateGuide(const GenTime newPos, const QString &comment)
     }
 }
 
+void Guide::updatePos()
+{
+    setPos(m_position.frames(m_view->fps()), 0);
+}
+
 //virtual
 int Guide::type() const
 {
@@ -106,6 +116,7 @@ QVariant Guide::itemChange(GraphicsItemChange change, const QVariant &value)
         QPointF newPos = value.toPointF();
         newPos.setY(0);
         newPos.setX(m_view->getSnapPointForPos(newPos.x()));
+        if (newPos.x() < 0.0) newPos.setX(0.0);
         return newPos;
     }
     return QGraphicsItem::itemChange(change, value);
@@ -118,7 +129,8 @@ QRectF Guide::boundingRect() const
     double width = m_pen.widthF() / scale * 2;
     QRectF rect(line().x1() - width / 2 , line().y1(), width, line().y2() - line().y1());
     if (KdenliveSettings::showmarkers()) {
-        rect.setWidth(width + m_width / scale);
+        // +3 to cover the arc at the end of the comment
+        rect.setWidth(width + m_width + 3);
     }
     return rect;
 }
@@ -128,12 +140,12 @@ QPainterPath Guide::shape() const
 {
     QPainterPath path;
     if (!scene()) return path;
-    double scale = m_view->matrix().m11();
-    double width = m_pen.widthF() / scale * 2;
+    double width = m_pen.widthF() * 2;
     path.addRect(line().x1() - width / 2 , line().y1(), width, line().y2() - line().y1());
-    if (KdenliveSettings::showmarkers()) {
+    if (KdenliveSettings::showmarkers() && scene()->views().count()) {
         const QFontMetrics metric = m_view->fontMetrics();
-        QRectF txtBounding(line().x1() + 1 / scale, line().y1() + 10, m_width / scale, metric.height() / m_view->matrix().m22());
+        int offset = scene()->views()[0]->verticalScrollBar()->value();
+        QRectF txtBounding(line().x1(), line().y1() + offset, m_width, metric.height());
         path.addRect(txtBounding);
     }
     return path;
@@ -143,17 +155,18 @@ QPainterPath Guide::shape() const
 void Guide::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget */*w*/)
 {
     QGraphicsLineItem::paint(painter, option);
-    if (KdenliveSettings::showmarkers()) {
-        painter->setMatrixEnabled(false);
-        QPointF p1 = painter->matrix().map(line()).p1() + QPointF(1, 0);
+    if (KdenliveSettings::showmarkers() && scene() && scene()->views().count()) {
+        QPointF p1 = line().p1();
         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;
-        path.addRoundedRect(txtBounding, 3, 3);
-        painter->fillPath(path, m_pen.color());
+	painter->setClipRect(option->rect);
+        // makes sure the text stays visible when scrolling vertical
+        int offset = scene()->views()[0]->verticalScrollBar()->value();
+
+        QRectF txtBounding = painter->boundingRect(p1.x(), p1.y() + offset, m_width, metric.height(), Qt::AlignLeft | Qt::AlignTop, m_label);
+	painter->setBrush(QBrush(m_pen.color()));
+	painter->drawRoundedRect(txtBounding.adjusted(-5, -5, 2, 1), 3, 3);
         painter->setPen(Qt::white);
-        painter->drawText(txtBounding, Qt::AlignCenter, m_label);
-        painter->setMatrixEnabled(true);
+        painter->drawText(txtBounding.adjusted(1, 0, 1, 0), Qt::AlignCenter, m_label);
     }
 }