Fix painting issues (disappearing cursor, clip borders)

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

diff --git a/src/clipitem.cpp b/src/clipitem.cpp
index 58934f05b2597f8848947ce418971a03a46f0f09..31e89f224430cc0ca0d4f151237237519180da37 100644 (file)
--- a/src/clipitem.cpp
+++ b/src/clipitem.cpp
@@ -643,9 +643,6 @@ void ClipItem::paint(QPainter *painter,
                      const QStyleOptionGraphicsItem *option,
                      QWidget *)
 {
-    /*if (parentItem()) m_opacity = 0.5;
-    else m_opacity = 1.0;
-    painter->setOpacity(m_opacity);*/
     QColor paintColor;
     if (parentItem()) paintColor = QColor(255, 248, 149);
     else paintColor = brush().color();
@@ -774,9 +771,7 @@ void ClipItem::paint(QPainter *painter,
             //painter->fillRect(QRect(br.x() + framepos, br.y(), 10, br.height()), QBrush(QColor(0, 0, 0, 150)));
         }
     }
-    pen.setColor(Qt::black);
-    pen.setStyle(Qt::SolidLine);
-    painter->setPen(pen);
+    painter->setPen(QPen());
 
     // draw start / end fades
     QBrush fades;
@@ -867,12 +862,16 @@ void ClipItem::paint(QPainter *painter,
 
     // draw clip border
     // expand clip rect to allow correct painting of clip border
+    QPen pen1(frameColor);
+    pen1.setWidthF(1.0);
+    pen1.setCosmetic(true);
+    painter->setPen(pen1);
 
-    exposed.setRight(exposed.right() + xoffset + 0.5);
+    /*exposed.setRight(exposed.right() + xoffset + 0.5);
     exposed.setBottom(exposed.bottom() + 1);
-    painter->setClipRect(exposed);
-
-    frameColor.setAlpha(alphaBase);
+    painter->setClipRect(exposed);*/
+    painter->setClipping(false);
+    /*frameColor.setAlpha(alphaBase);
     painter->setPen(frameColor);
     QLineF line(br.left() + xoffset, br.top(), br.right() - xoffset, br.top());
     painter->drawLine(line);
@@ -888,8 +887,8 @@ void ClipItem::paint(QPainter *painter,
 
     painter->setPen(QColor(255, 255, 255, 60));
     line.setLine(br.right() - xoffset, br.bottom() - 1.0, br.left() + xoffset, br.bottom() - 1.0);
-    painter->drawLine(line);
-    //painter->drawRect(br);
+    painter->drawLine(line);*/
+    painter->drawRect(br);
 }
 
 

diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp
index a85b3d050c947c3efaff8715560cf6e2bfffbb41..32d5b94b74e54dca560d80aa46c4c20dbc067e39 100644 (file)
--- a/src/customtrackview.cpp
+++ b/src/customtrackview.cpp
@@ -134,6 +134,10 @@ CustomTrackView::CustomTrackView(KdenliveDoc *doc, CustomTrackScene* projectscen
     verticalScrollBar()->setMaximum(maxWidth);
     m_cursorLine = projectscene->addLine(0, 0, 0, maxWidth);
     m_cursorLine->setZValue(1000);
+    QPen pen1;
+    pen1.setWidthF(1.0);
+    pen1.setCosmetic(true);
+    m_cursorLine->setPen(pen1);
 
     KIcon razorIcon("edit-cut");
     m_razorCursor = QCursor(razorIcon.pixmap(22, 22));

diff --git a/src/transition.cpp b/src/transition.cpp
index 0cf05cf162f96f04568647fd073f927c5ba3c5f1..ff492445cea41866050011f956b307081cf473b1 100644 (file)
--- a/src/transition.cpp
+++ b/src/transition.cpp
@@ -193,6 +193,7 @@ void Transition::paint(QPainter *painter,
         painter->drawText(painter->matrix().map(p3) + QPointF(25, 0), transitionName());*/
     painter->setMatrixEnabled(true);
     QPen pen = painter->pen();
+
     if (isSelected()) {
         pen.setColor(Qt::red);
         //pen.setWidth(2);
@@ -200,11 +201,11 @@ void Transition::paint(QPainter *painter,
         pen.setColor(Qt::black);
         //pen.setWidth(1);
     }
-    // expand clip rect to allow correct painting of clip border
-    exposed.setRight(exposed.right() + 1 / scale + 0.5);
-    exposed.setBottom(exposed.bottom() + 1);
-    painter->setClipRect(exposed);
+
+    pen.setWidthF(1.0);
+    pen.setCosmetic(true);
     painter->setPen(pen);
+    painter->setClipping(false);
     painter->drawRect(br);
 }