X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fguide.cpp;h=299a82b07f8b4f4b7659f855232601fe38ccbd65;hb=ead7176d2ab818ec3a1275aeca2b2fc0c1ea1276;hp=93d9d7973b05b5d7c849250f16badc88695bf27d;hpb=7d1f818376b25f793ad6e8960b73a24a39605945;p=kdenlive

diff --git a/src/guide.cpp b/src/guide.cpp
index 93d9d797..299a82b0 100644
--- a/src/guide.cpp
+++ b/src/guide.cpp
@@ -35,8 +35,12 @@ Guide::Guide(CustomTrackView *view, GenTime pos, QString label, double height) :
         m_pen(QPen())
 {
     setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIgnoresTransformations);
+#if QT_VERSION >= 0x040600
+    setFlag(QGraphicsItem::ItemSendsGeometryChanges, true);
+#endif
     setToolTip(label);
     setLine(0, 0, 0, height);
+    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));
@@ -110,6 +114,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);
@@ -122,7 +127,7 @@ 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);
+        rect.setWidth(width + m_width);
     }
     return rect;
 }
@@ -132,12 +137,11 @@ 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()) {
         const QFontMetrics metric = m_view->fontMetrics();
-        QRectF txtBounding(line().x1() + 1 / scale, line().y1() + 10, m_width / scale, metric.height() / m_view->matrix().m22());
+        QRectF txtBounding(line().x1(), line().y1() + 10, m_width, metric.height());
         path.addRect(txtBounding);
     }
     return path;