Show frame border on top of background image in monitor scene (on-monitor effects)

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

diff --git a/src/geometrywidget.cpp b/src/geometrywidget.cpp
index 549774178decdf6b9752ae81900e146ca0d03311..41159724830bcae050682102f6b210145b23e923 100644 (file)
--- a/src/geometrywidget.cpp
+++ b/src/geometrywidget.cpp
@@ -362,7 +362,7 @@ void GeometryWidget::slotCheckMonitorPosition(int renderPos)
     if (m_showScene) {
         /*
             We do only get the position in timeline if this geometry belongs to a transition,
-            therefore we need to ways here.
+            therefore we need two ways here.
         */
         if (m_isEffect) {
             emit checkMonitorPosition(renderPos);

diff --git a/src/monitorscene.cpp b/src/monitorscene.cpp
index 0e313a7a1ae7bb17466f63a39ab8849f2df80d03..655425e27ed769deec4dc8e86452593711e9aa57 100644 (file)
--- a/src/monitorscene.cpp
+++ b/src/monitorscene.cpp
@@ -40,19 +40,19 @@ MonitorScene::MonitorScene(Render *renderer, QObject* parent) :
 {
     setBackgroundBrush(QBrush(QColor(KdenliveSettings::window_background().name())));
 
-    QPen framepen(Qt::SolidLine);
+    QPen framepen(Qt::DotLine);
     framepen.setColor(Qt::red);
 
     m_frameBorder = new QGraphicsRectItem(QRectF(0, 0, m_renderer->frameRenderWidth(), m_renderer->renderHeight()));
     m_frameBorder->setPen(framepen);
-    m_frameBorder->setZValue(-2);
+    m_frameBorder->setZValue(-1);
     m_frameBorder->setBrush(Qt::transparent);
     m_frameBorder->setFlags(0);
     addItem(m_frameBorder);
 
     m_lastUpdate.start();
     m_background = new QGraphicsPixmapItem();
-    m_background->setZValue(-1);
+    m_background->setZValue(-2);
     m_background->setFlags(0);
     m_background->setShapeMode(QGraphicsPixmapItem::BoundingRectShape);
     m_background->setTransformationMode(Qt::FastTransformation);
@@ -90,7 +90,7 @@ void MonitorScene::slotUpdateBackground()
 {
     if (m_view && m_view->isVisible()) {
         if (m_lastUpdate.elapsed() > 100) {
-            m_background->setPixmap(QPixmap::fromImage(m_backgroundImage, Qt::ThresholdDither));
+            m_background->setPixmap(QPixmap::fromImage(m_backgroundImage));
             m_lastUpdate.start();
         }
     }