Update monitorscene rect when changing profile

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

diff --git a/src/geometrywidget.cpp b/src/geometrywidget.cpp
index ef01e0fc76e280c32555d76139f0e23bae6b3be3..0e99770091452e196bbb36a378aa141bfb451efd 100644 (file)
--- a/src/geometrywidget.cpp
+++ b/src/geometrywidget.cpp
@@ -140,7 +140,7 @@ GeometryWidget::~GeometryWidget()
     delete m_timeline;
     m_scene->removeItem(m_rect);
     delete m_geometry;
-    m_monitor->slotEffectScene(false);
+    if (m_monitor) m_monitor->slotEffectScene(false);
 }
 
 void GeometryWidget::updateTimecodeFormat()

diff --git a/src/monitor.cpp b/src/monitor.cpp
index 06f088a3c9c5222a7f96da9011c2d99706930d77..d526bbae3bcd2d47e655cd795d903a98a9573717 100644 (file)
--- a/src/monitor.cpp
+++ b/src/monitor.cpp
@@ -55,7 +55,9 @@ Monitor::Monitor(QString name, MonitorManager *manager, QString profile, QWidget
         m_isActive(false),
         m_scale(1),
         m_length(0),
-        m_dragStarted(false)
+        m_dragStarted(false),
+        m_effectScene(NULL),
+        m_effectView(NULL)
 {
     m_ui.setupUi(this);
     QVBoxLayout *layout = new QVBoxLayout;
@@ -777,6 +779,9 @@ void Monitor::resetProfile(const QString profile)
     m_timePos->updateTimeCode(m_monitorManager->timecode());
     if (render == NULL) return;
     render->resetProfile(profile);
+    if (m_effectScene) {
+        m_effectScene->resetProfile();
+    }
 }
 
 void Monitor::saveSceneList(QString path, QDomElement info)

diff --git a/src/monitorscene.cpp b/src/monitorscene.cpp
index 6a2cde78134b7dc6a1d7841da06433f3806124ee..f705e47b9c42ae5f38a2ff4758b0eefd6a50e277 100644 (file)
--- a/src/monitorscene.cpp
+++ b/src/monitorscene.cpp
@@ -77,6 +77,12 @@ void MonitorScene::setUp()
     slotUpdateBackground(true);
 }
 
+void MonitorScene::resetProfile()
+{
+    const QRectF border(0, 0, m_renderer->renderWidth(), m_renderer->renderHeight());
+    m_frameBorder->setRect(border);
+}
+
 void MonitorScene::setEnabled(bool enabled)
 {
     m_enabled = enabled;
@@ -114,7 +120,7 @@ void MonitorScene::slotSetBackgroundImage(QImage image)
 
 resizeModes MonitorScene::getResizeMode(QGraphicsRectItem *item, QPoint pos)
 {
-    if(!m_view)
+    if (!m_view)
         return NoResize;
 
     QRectF rect = item->rect().normalized();
@@ -266,7 +272,7 @@ void MonitorScene::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
         bool itemFound = false;
         QList<QGraphicsItem *> itemList = items(QRectF(mousePos, QSizeF(4, 4)).toRect());
 
-        foreach (const QGraphicsItem* item, itemList) {
+        foreach(const QGraphicsItem* item, itemList) {
             if (item->zValue() >= 0 && item->flags() &QGraphicsItem::ItemIsMovable) {
                 // Rect
                 if (item->type() == 3) {

diff --git a/src/monitorscene.h b/src/monitorscene.h
index 5afcf1e72dde149c2b19db86e10d3065dad68abb..65237539943975f8892b177db4ca0241143a8b32 100644 (file)
--- a/src/monitorscene.h
+++ b/src/monitorscene.h
@@ -36,6 +36,7 @@ public:
     void setUp();
     void setEnabled(bool enabled = true);
     bool getDirectUpdate();
+    void resetProfile();
 
 protected:
     virtual void mousePressEvent(QGraphicsSceneMouseEvent *event);