[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdenlive/Applications/16.08] src: Fix Recent regression - groups lost on project opening
From:       Jean-Baptiste Mardelle <jb () kdenlive ! org>
Date:       2016-09-11 20:18:14
Message-ID: E1bjBCg-0000BZ-S0 () code ! kde ! org
[Download RAW message or body]

Git commit b7425707071a6955d50be6f58a5d86dc173bb25d by Jean-Baptiste Mardelle.
Committed on 11/09/2016 at 20:17.
Pushed by mardelle into branch 'Applications/16.08'.

Fix Recent regression - groups lost on project opening
Fix group width 1 frame too short
BUG: 368342

M  +1    -1    src/mainwindow.cpp
M  +2    -2    src/timeline/abstractgroupitem.cpp

http://commits.kde.org/kdenlive/b7425707071a6955d50be6f58a5d86dc173bb25d

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index aea2103..944ce0c 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -1866,7 +1866,7 @@ void MainWindow::connectDocument()
     m_normalEditTool->setChecked(true);
     connect(m_projectMonitor, SIGNAL(durationChanged(int)), this, SLOT(slotUpdateProjectDuration(int)));
     pCore->monitorManager()->setDocument(project);
-    trackView->updateProfile(false);
+    trackView->updateProfile(1.0);
     if (m_recMonitor) {
         m_recMonitor->slotUpdateCaptureFolder(project->projectFolder().path() + QDir::separator());
     }
diff --git a/src/timeline/abstractgroupitem.cpp b/src/timeline/abstractgroupitem.cpp
index 7234c5f..7817f12 100644
--- a/src/timeline/abstractgroupitem.cpp
+++ b/src/timeline/abstractgroupitem.cpp
@@ -176,8 +176,8 @@ void AbstractGroupItem::paint(QPainter *p, const QStyleOptionGraphicsItem *optio
     pen.setStyle(Qt::DashLine);
     pen.setWidthF(0.0);
     p->setPen(pen);
-    QRectF bd = childrenBoundingRect().adjusted(0, 0, -1, 0);
-    p->drawRoundedRect(bd, 3, 3);
+    QRectF bd = childrenBoundingRect().adjusted(0, 0, 0, 0);
+    p->drawRect(bd);
 }
 
 int AbstractGroupItem::trackForPos(int position)
[prev in list] [next in list] [prev in thread] [next in thread]