From: <j-...@us...> - 2008-03-02 18:18:01
|
Revision: 1979 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=1979&view=rev Author: j-b-m Date: 2008-03-02 10:18:06 -0800 (Sun, 02 Mar 2008) Log Message: ----------- Fix seeking in timeline Modified Paths: -------------- branches/KDE4/src/customtrackview.cpp Modified: branches/KDE4/src/customtrackview.cpp =================================================================== --- branches/KDE4/src/customtrackview.cpp 2008-03-02 17:31:39 UTC (rev 1978) +++ branches/KDE4/src/customtrackview.cpp 2008-03-02 18:18:06 UTC (rev 1979) @@ -536,7 +536,7 @@ { m_cursorPos = pos; m_cursorLine->setPos(pos, 0); - int frame = mapToScene(QPoint(pos, 0)).x() / m_scale; + int frame = pos / m_scale; if (seek) m_document->renderer()->seek(GenTime(frame, m_document->fps())); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2008-03-02 18:37:45
|
Revision: 1980 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=1980&view=rev Author: j-b-m Date: 2008-03-02 10:37:51 -0800 (Sun, 02 Mar 2008) Log Message: ----------- Fix visual resize tooltips Modified Paths: -------------- branches/KDE4/src/customtrackview.cpp Modified: branches/KDE4/src/customtrackview.cpp =================================================================== --- branches/KDE4/src/customtrackview.cpp 2008-03-02 18:18:06 UTC (rev 1979) +++ branches/KDE4/src/customtrackview.cpp 2008-03-02 18:37:51 UTC (rev 1980) @@ -144,7 +144,7 @@ } if (item && event->buttons() == Qt::NoButton) { ClipItem *clip = (ClipItem*) item; - double size = mapToScene(QPoint(8, 0)).x(); + double size = 8; OPERATIONTYPE opMode = clip->operationMode(mapToScene(event->pos()), m_scale); if (opMode == m_moveOpMode) { QGraphicsView::mouseMoveEvent(event); @@ -154,6 +154,7 @@ if (m_visualTip) { if (m_animation) delete m_animation; m_animation = NULL; + m_animationTimer->stop(); delete m_visualTip; m_visualTip = NULL; } @@ -257,9 +258,11 @@ } if (m_visualTip) { if (m_animation) delete m_animation; + m_animationTimer->stop(); m_animation = NULL; delete m_visualTip; m_visualTip = NULL; + } setCursor(Qt::ArrowCursor); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2008-03-08 15:04:27
|
Revision: 2013 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=2013&view=rev Author: j-b-m Date: 2008-03-08 07:04:33 -0800 (Sat, 08 Mar 2008) Log Message: ----------- FIx:?\194?\160transition needs end time, not duration Modified Paths: -------------- branches/KDE4/src/customtrackview.cpp Modified: branches/KDE4/src/customtrackview.cpp =================================================================== --- branches/KDE4/src/customtrackview.cpp 2008-03-08 14:39:57 UTC (rev 2012) +++ branches/KDE4/src/customtrackview.cpp 2008-03-08 15:04:33 UTC (rev 2013) @@ -342,7 +342,7 @@ else if (m_operationMode == RESIZEEND) m_startPos = QPointF(m_dragItem->endPos().frames(m_document->fps()), m_dragItem->track()); else if (m_operationMode == TRANSITIONSTART) { - Transition tra(m_dragItem, LUMA_TRANSITION, m_dragItem->startPos(), GenTime(2.5)); + Transition tra(m_dragItem, LUMA_TRANSITION, m_dragItem->startPos(), m_dragItem->startPos() + GenTime(2.5)); m_dragItem->addTransition(tra); } kDebug() << "//////// ITEM CLICKED: " << m_startPos; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2008-03-08 16:30:21
|
Revision: 2015 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=2015&view=rev Author: j-b-m Date: 2008-03-08 08:30:26 -0800 (Sat, 08 Mar 2008) Log Message: ----------- Fix indent issue Modified Paths: -------------- branches/KDE4/src/customtrackview.cpp Modified: branches/KDE4/src/customtrackview.cpp =================================================================== --- branches/KDE4/src/customtrackview.cpp 2008-03-08 15:42:04 UTC (rev 2014) +++ branches/KDE4/src/customtrackview.cpp 2008-03-08 16:30:26 UTC (rev 2015) @@ -342,7 +342,7 @@ else if (m_operationMode == RESIZEEND) m_startPos = QPointF(m_dragItem->endPos().frames(m_document->fps()), m_dragItem->track()); else if (m_operationMode == TRANSITIONSTART) { - Transition tra(m_dragItem, LUMA_TRANSITION, m_dragItem->startPos(), m_dragItem->startPos() + GenTime(2.5)); + Transition tra(m_dragItem, LUMA_TRANSITION, m_dragItem->startPos(), m_dragItem->startPos() + GenTime(2.5)); m_dragItem->addTransition(tra); } kDebug() << "//////// ITEM CLICKED: " << m_startPos; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2008-03-08 21:53:42
|
Revision: 2021 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=2021&view=rev Author: j-b-m Date: 2008-03-08 13:53:45 -0800 (Sat, 08 Mar 2008) Log Message: ----------- Use better cursor for clip resize if available Modified Paths: -------------- branches/KDE4/src/customtrackview.cpp Modified: branches/KDE4/src/customtrackview.cpp =================================================================== --- branches/KDE4/src/customtrackview.cpp 2008-03-08 18:56:19 UTC (rev 2020) +++ branches/KDE4/src/customtrackview.cpp 2008-03-08 21:53:45 UTC (rev 2021) @@ -26,6 +26,7 @@ #include <KDebug> #include <KLocale> #include <KUrl> +#include <KCursor> #include "customtrackview.h" #include "clipitem.h" @@ -158,6 +159,7 @@ if (opMode == MOVE) { setCursor(Qt::OpenHandCursor); } else if (opMode == RESIZESTART) { + setCursor(KCursor("left_side", Qt::SizeHorCursor)); kDebug() << "******** RESIZE CLIP START; WIDTH: " << size; if (m_visualTip == NULL) { QPolygon polygon; @@ -183,8 +185,8 @@ scene()->addItem(m_visualTip); m_animationTimer->start(); } - setCursor(Qt::SizeHorCursor); } else if (opMode == RESIZEEND) { + setCursor(KCursor("right_side", Qt::SizeHorCursor)); if (m_visualTip == NULL) { QPolygon polygon; polygon << QPoint(clip->rect().x() + clip->rect().width(), clip->rect().y() + clip->rect().height() / 2 - size * 2); @@ -210,7 +212,6 @@ scene()->addItem(m_visualTip); m_animationTimer->start(); } - setCursor(Qt::SizeHorCursor); } else if (opMode == FADEIN) { if (m_visualTip == NULL) { m_visualTip = new QGraphicsEllipseItem(clip->rect().x() + clip->fadeIn() * m_scale - size, clip->rect().y() - 8, size * 2, 16); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2008-03-08 22:00:03
|
Revision: 2022 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=2022&view=rev Author: j-b-m Date: 2008-03-08 14:00:07 -0800 (Sat, 08 Mar 2008) Log Message: ----------- Some more cursor fun Modified Paths: -------------- branches/KDE4/src/customtrackview.cpp Modified: branches/KDE4/src/customtrackview.cpp =================================================================== --- branches/KDE4/src/customtrackview.cpp 2008-03-08 21:53:45 UTC (rev 2021) +++ branches/KDE4/src/customtrackview.cpp 2008-03-08 22:00:07 UTC (rev 2022) @@ -337,6 +337,7 @@ emit clipItemSelected(m_dragItem); m_clickPoint = mapToScene(event->pos()).x() - m_dragItem->startPos().frames(m_document->fps()) * m_scale; m_operationMode = m_dragItem->operationMode(item->mapFromScene(mapToScene(event->pos())), m_scale); + if (m_operationMode == MOVE) setCursor(Qt::ClosedHandCursor); if (m_operationMode == MOVE || m_operationMode == RESIZESTART) m_startPos = QPointF(m_dragItem->startPos().frames(m_document->fps()), m_dragItem->track()); else if (m_operationMode == RESIZEEND) @@ -581,7 +582,7 @@ QGraphicsView::mouseReleaseEvent(event); setDragMode(QGraphicsView::NoDrag); if (m_dragItem == NULL) return; - //kDebug()<<"/// MOVING CLIP: "<<m_startPos<<", END: "<<QPoint(m_dragItem->rect().x(),m_dragItem->rect().y()); + if (m_operationMode == MOVE) setCursor(Qt::OpenHandCursor); if (m_operationMode == MOVE && m_startPos.x() != m_dragItem->startPos().frames(m_document->fps())) { // move clip MoveClipCommand *command = new MoveClipCommand(this, m_startPos, QPointF(m_dragItem->startPos().frames(m_document->fps()), m_dragItem->track()), false); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2008-03-08 22:15:02
|
Revision: 2023 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=2023&view=rev Author: j-b-m Date: 2008-03-08 14:05:15 -0800 (Sat, 08 Mar 2008) Log Message: ----------- Don't move cursor if user wants to select multiple clips Modified Paths: -------------- branches/KDE4/src/customtrackview.cpp Modified: branches/KDE4/src/customtrackview.cpp =================================================================== --- branches/KDE4/src/customtrackview.cpp 2008-03-08 22:00:07 UTC (rev 2022) +++ branches/KDE4/src/customtrackview.cpp 2008-03-08 22:05:15 UTC (rev 2023) @@ -291,7 +291,7 @@ } } else { m_moveOpMode = NONE; - if (event->buttons() != Qt::NoButton) { + if (event->buttons() != Qt::NoButton && event->modifiers() == Qt::NoModifier) { setCursorPos((int) mapToScene(event->pos().x(), 0).x() / m_scale); } if (m_visualTip) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2008-03-18 00:17:28
|
Revision: 2073 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=2073&view=rev Author: j-b-m Date: 2008-03-17 17:17:35 -0700 (Mon, 17 Mar 2008) Log Message: ----------- Fix transition moving breaking timeline Modified Paths: -------------- branches/KDE4/src/customtrackview.cpp Modified: branches/KDE4/src/customtrackview.cpp =================================================================== --- branches/KDE4/src/customtrackview.cpp 2008-03-17 23:41:28 UTC (rev 2072) +++ branches/KDE4/src/customtrackview.cpp 2008-03-18 00:17:35 UTC (rev 2073) @@ -637,19 +637,19 @@ // move clip MoveClipCommand *command = new MoveClipCommand(this, m_startPos, QPointF(m_dragItem->startPos().frames(m_document->fps()), m_dragItem->track()), false); m_commandStack->push(command); - m_document->renderer()->mltMoveClip(m_tracksCount - m_startPos.y(), m_tracksCount - m_dragItem->track(), m_startPos.x(), m_dragItem->startPos().frames(m_document->fps())); + if (m_dragItem->type() == AVWIDGET) m_document->renderer()->mltMoveClip(m_tracksCount - m_startPos.y(), m_tracksCount - m_dragItem->track(), m_startPos.x(), m_dragItem->startPos().frames(m_document->fps())); } else if (m_operationMode == RESIZESTART) { // resize start ResizeClipCommand *command = new ResizeClipCommand(this, m_startPos, QPointF(m_dragItem->startPos().frames(m_document->fps()), m_dragItem->track()), true, false); - m_document->renderer()->mltResizeClipStart(m_tracksCount - m_dragItem->track(), m_dragItem->endPos(), m_dragItem->startPos(), GenTime(m_startPos.x(), m_document->fps()), m_dragItem->cropStart(), m_dragItem->cropStart() + m_dragItem->endPos() - m_dragItem->startPos()); + if (m_dragItem->type() == AVWIDGET) m_document->renderer()->mltResizeClipStart(m_tracksCount - m_dragItem->track(), m_dragItem->endPos(), m_dragItem->startPos(), GenTime(m_startPos.x(), m_document->fps()), m_dragItem->cropStart(), m_dragItem->cropStart() + m_dragItem->endPos() - m_dragItem->startPos()); m_commandStack->push(command); m_document->renderer()->doRefresh(); } else if (m_operationMode == RESIZEEND) { // resize end ResizeClipCommand *command = new ResizeClipCommand(this, m_startPos, QPointF(m_dragItem->endPos().frames(m_document->fps()), m_dragItem->track()), false, false); - m_document->renderer()->mltResizeClipEnd(m_tracksCount - m_dragItem->track(), m_dragItem->startPos(), m_dragItem->cropStart(), m_dragItem->cropStart() + m_dragItem->endPos() - m_dragItem->startPos()); + if (m_dragItem->type() == AVWIDGET) m_document->renderer()->mltResizeClipEnd(m_tracksCount - m_dragItem->track(), m_dragItem->startPos(), m_dragItem->cropStart(), m_dragItem->cropStart() + m_dragItem->endPos() - m_dragItem->startPos()); m_commandStack->push(command); m_document->renderer()->doRefresh(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ble...@us...> - 2008-03-18 13:17:09
|
Revision: 2075 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=2075&view=rev Author: blendamedt Date: 2008-03-18 06:17:11 -0700 (Tue, 18 Mar 2008) Log Message: ----------- are the tracknumbers in reverse order ? Modified Paths: -------------- branches/KDE4/src/customtrackview.cpp Modified: branches/KDE4/src/customtrackview.cpp =================================================================== --- branches/KDE4/src/customtrackview.cpp 2008-03-18 12:42:07 UTC (rev 2074) +++ branches/KDE4/src/customtrackview.cpp 2008-03-18 13:17:11 UTC (rev 2075) @@ -515,12 +515,9 @@ void CustomTrackView::addTransition(int startTrack, GenTime startPos , QDomElement) { QMap < QString, QString> map; - map["combine"] = "1"; - map["valign"] = "1"; - map["progressive"] = "1"; - map["fill"] = "1"; - map["halign"] = "1"; - m_document->renderer()->mltAddTransition("composite", startTrack, startTrack + 1 , startPos, startPos + GenTime(2.5), map); + /*map["start"] = "0.0"; + map["end"] = "1.0";*/ + m_document->renderer()->mltAddTransition("luma", startTrack+4, startTrack + 5 , startPos, startPos + GenTime(2.5), map); m_document->setModified(true); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2008-03-24 13:22:46
|
Revision: 2115 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=2115&view=rev Author: j-b-m Date: 2008-03-24 06:22:51 -0700 (Mon, 24 Mar 2008) Log Message: ----------- Fix crash when trying to apply effect on transition item Modified Paths: -------------- branches/KDE4/src/customtrackview.cpp Modified: branches/KDE4/src/customtrackview.cpp =================================================================== --- branches/KDE4/src/customtrackview.cpp 2008-03-24 12:44:56 UTC (rev 2114) +++ branches/KDE4/src/customtrackview.cpp 2008-03-24 13:22:51 UTC (rev 2115) @@ -503,7 +503,7 @@ } kDebug() << "// REQUESTING EFFECT ON CLIP: " << pos.frames(25) << ", TRK: " << track; for (int i = 0; i < itemList.count(); i++) { - if (itemList.at(i)->type() == AVWIDGET && (itemList.at(i)->isSelected() || track != -1)) { + if (itemList.at(i)->type() == AVWIDGET && itemList.at(i)->isSelected()) { ClipItem *item = (ClipItem *)itemList.at(i); // the kdenlive_ix int is used to identify an effect in mlt's playlist, should // not be changed @@ -791,11 +791,27 @@ } ClipItem *CustomTrackView::getClipItemAt(int pos, int track) { - return (ClipItem *) scene()->itemAt(pos * m_scale, track * m_tracksHeight + m_tracksHeight / 2); + QList<QGraphicsItem *> list = scene()->items(QPointF(pos * m_scale, track * m_tracksHeight + m_tracksHeight / 2)); + ClipItem *clip = NULL; + for (int i = 0; i < list.size(); ++i) { + if (list.at(i)->type() == AVWIDGET) { + clip = static_cast <ClipItem *> (list.at(i)); + break; + } + } + return clip; } ClipItem *CustomTrackView::getClipItemAt(GenTime pos, int track) { - return (ClipItem *) scene()->itemAt(pos.frames(m_document->fps()) * m_scale, track * m_tracksHeight + m_tracksHeight / 2); + QList<QGraphicsItem *> list = scene()->items(QPointF(pos.frames(m_document->fps()) * m_scale, track * m_tracksHeight + m_tracksHeight / 2)); + ClipItem *clip = NULL; + for (int i = 0; i < list.size(); ++i) { + if (list.at(i)->type() == AVWIDGET) { + clip = static_cast <ClipItem *> (list.at(i)); + break; + } + } + return clip; } void CustomTrackView::moveClip(const QPointF &startPos, const QPointF &endPos) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2008-03-24 13:44:19
|
Revision: 2116 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=2116&view=rev Author: j-b-m Date: 2008-03-24 06:34:59 -0700 (Mon, 24 Mar 2008) Log Message: ----------- Also snap to transitions Modified Paths: -------------- branches/KDE4/src/customtrackview.cpp Modified: branches/KDE4/src/customtrackview.cpp =================================================================== --- branches/KDE4/src/customtrackview.cpp 2008-03-24 13:22:51 UTC (rev 2115) +++ branches/KDE4/src/customtrackview.cpp 2008-03-24 13:34:59 UTC (rev 2116) @@ -863,7 +863,7 @@ QList<QGraphicsItem *> itemList = items(); for (int i = 0; i < itemList.count(); i++) { if (itemList.at(i)->type() == AVWIDGET && itemList.at(i) != selected) { - ClipItem *item = (ClipItem *)itemList.at(i); + ClipItem *item = static_cast <ClipItem *> (itemList.at(i)); GenTime start = item->startPos(); GenTime end = item->endPos(); m_snapPoints.append(start); @@ -873,6 +873,17 @@ if (end > offset) m_snapPoints.append(end - offset); } } + else if (itemList.at(i)->type() == TRANSITIONWIDGET) { + Transition *transition = static_cast <Transition*> (itemList.at(i)); + GenTime start = transition->transitionStartTime(); + GenTime end = transition->transitionEndTime(); + m_snapPoints.append(start); + m_snapPoints.append(end); + if (offset != GenTime()) { + if (start > offset) m_snapPoints.append(start - offset); + if (end > offset) m_snapPoints.append(end - offset); + } + } } qSort(m_snapPoints); //for (int i = 0; i < m_snapPoints.size(); ++i) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2008-03-26 22:45:36
|
Revision: 2126 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=2126&view=rev Author: j-b-m Date: 2008-03-26 15:45:42 -0700 (Wed, 26 Mar 2008) Log Message: ----------- Transition resize Modified Paths: -------------- branches/KDE4/src/customtrackview.cpp Modified: branches/KDE4/src/customtrackview.cpp =================================================================== --- branches/KDE4/src/customtrackview.cpp 2008-03-26 21:16:32 UTC (rev 2125) +++ branches/KDE4/src/customtrackview.cpp 2008-03-26 22:45:42 UTC (rev 2126) @@ -753,17 +753,40 @@ } else if (m_operationMode == RESIZESTART) { // resize start - ResizeClipCommand *command = new ResizeClipCommand(this, m_startPos, QPointF(m_dragItem->startPos().frames(m_document->fps()), m_dragItem->track()), true, false); + if (m_dragItem->type() == AVWIDGET) { + m_document->renderer()->mltResizeClipStart(m_tracksList.count() - m_dragItem->track(), m_dragItem->endPos(), m_dragItem->startPos(), GenTime((int)m_startPos.x(), m_document->fps()), m_dragItem->cropStart(), m_dragItem->cropStart() + m_dragItem->endPos() - m_dragItem->startPos()); + ResizeClipCommand *command = new ResizeClipCommand(this, m_startPos, QPointF(m_dragItem->startPos().frames(m_document->fps()), m_dragItem->track()), true, false); + m_commandStack->push(command); + } else if (m_dragItem->type() == TRANSITIONWIDGET) { + Transition* transition = (Transition*)m_dragItem; + GenTime oldin = transition->transitionStartTime(); + GenTime oldout = transition->transitionEndTime(); + GenTime newin = m_dragItem->startPos(); + GenTime newout = m_dragItem->endPos(); + transition->resizeTransitionStart(newin); + MoveTransitionCommand *command = new MoveTransitionCommand(this, QPointF(oldin.frames(m_document->fps()), oldout.frames(m_document->fps())), QPointF(newin.frames(m_document->fps()), newout.frames(m_document->fps())), (int) m_startPos.y(), (int)(m_dragItem->track()), false); + m_commandStack->push(command); + m_document->renderer()->mltMoveTransition(transition->transitionName(), (int)(m_tracksList.count() - m_startPos.y()), 0, oldin, oldout, newin, newout); + } - if (m_dragItem->type() == AVWIDGET) m_document->renderer()->mltResizeClipStart(m_tracksList.count() - m_dragItem->track(), m_dragItem->endPos(), m_dragItem->startPos(), GenTime((int)m_startPos.x(), m_document->fps()), m_dragItem->cropStart(), m_dragItem->cropStart() + m_dragItem->endPos() - m_dragItem->startPos()); - m_commandStack->push(command); m_document->renderer()->doRefresh(); } else if (m_operationMode == RESIZEEND) { // resize end - ResizeClipCommand *command = new ResizeClipCommand(this, m_startPos, QPointF(m_dragItem->endPos().frames(m_document->fps()), m_dragItem->track()), false, false); - - if (m_dragItem->type() == AVWIDGET) m_document->renderer()->mltResizeClipEnd(m_tracksList.count() - m_dragItem->track(), m_dragItem->startPos(), m_dragItem->cropStart(), m_dragItem->cropStart() + m_dragItem->endPos() - m_dragItem->startPos()); - m_commandStack->push(command); + if (m_dragItem->type() == AVWIDGET) { + ResizeClipCommand *command = new ResizeClipCommand(this, m_startPos, QPointF(m_dragItem->endPos().frames(m_document->fps()), m_dragItem->track()), false, false); + m_document->renderer()->mltResizeClipEnd(m_tracksList.count() - m_dragItem->track(), m_dragItem->startPos(), m_dragItem->cropStart(), m_dragItem->cropStart() + m_dragItem->endPos() - m_dragItem->startPos()); + m_commandStack->push(command); + } else if (m_dragItem->type() == TRANSITIONWIDGET) { + Transition* transition = (Transition*)m_dragItem; + GenTime oldin = transition->transitionStartTime(); + GenTime oldout = transition->transitionEndTime(); + GenTime newin = m_dragItem->startPos(); + GenTime newout = m_dragItem->endPos(); + transition->resizeTransitionEnd(newout); + MoveTransitionCommand *command = new MoveTransitionCommand(this, QPointF(oldin.frames(m_document->fps()), oldout.frames(m_document->fps())), QPointF(newin.frames(m_document->fps()), newout.frames(m_document->fps())), (int) m_startPos.y(), (int)(m_dragItem->track()), false); + m_commandStack->push(command); + m_document->renderer()->mltMoveTransition(transition->transitionName(), (int)(m_tracksList.count() - m_startPos.y()), 0, oldin, oldout, newin, newout); + } m_document->renderer()->doRefresh(); } m_document->setModified(true); @@ -857,8 +880,22 @@ kDebug() << "---------------- ERROR, CANNOT find transition to move at: " << startPos.x() * m_scale * FRAME_SIZE + 1 << ", " << startPos.y() * m_tracksHeight + m_tracksHeight / 2; return; } - kDebug() << "---------------- Move TRANSITION FROM: " << startPos.x() << ", END:" << endPos.x() << ",TRACKS: " << oldtrack << " TO " << newtrack; - item->moveTo((int)endPos.x(), m_scale, (newtrack - oldtrack) * m_tracksHeight, newtrack); + //kDebug() << "---------------- Move TRANSITION FROM: " << startPos.x() << ", END:" << endPos.x() << ",TRACKS: " << oldtrack << " TO " << newtrack; + + //kDebug()<<"/// RESIZE TRANS START: ("<< startPos.x()<<"x"<< startPos.y()<<") / ("<<endPos.x()<<"x"<< endPos.y()<<")"; + if (endPos.y() - endPos.x() == startPos.y() - startPos.x()) { + // Transition was moved + item->moveTo((int)endPos.x(), m_scale, (newtrack - oldtrack) * m_tracksHeight, newtrack); + item->moveTransition(GenTime((int)(endPos.x() - startPos.x()), m_document->fps())); + } else if (endPos.y() == startPos.y()) { + // Transition start resize + item->resizeStart((int)endPos.x(), m_scale); + item->resizeTransitionStart(GenTime((int) endPos.x(), m_document->fps())); + } else { + // Transition end resize; + item->resizeEnd((int)endPos.y(), m_scale); + item->resizeTransitionEnd(GenTime((int) endPos.y(), m_document->fps())); + } //item->moveTransition(GenTime((int) (endPos.x() - startPos.x()), m_document->fps())); m_document->renderer()->mltMoveTransition(item->transitionName(), m_tracksList.count() - oldtrack, oldtrack - newtrack, GenTime((int) startPos.x(), m_document->fps()), GenTime((int) startPos.y(), m_document->fps()), GenTime((int) endPos.x(), m_document->fps()), GenTime((int) endPos.y(), m_document->fps())); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2008-03-27 22:50:37
|
Revision: 2131 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=2131&view=rev Author: j-b-m Date: 2008-03-27 15:50:43 -0700 (Thu, 27 Mar 2008) Log Message: ----------- Fix transition moving Modified Paths: -------------- branches/KDE4/src/customtrackview.cpp Modified: branches/KDE4/src/customtrackview.cpp =================================================================== --- branches/KDE4/src/customtrackview.cpp 2008-03-27 22:50:29 UTC (rev 2130) +++ branches/KDE4/src/customtrackview.cpp 2008-03-27 22:50:43 UTC (rev 2131) @@ -753,7 +753,7 @@ m_commandStack->push(command); //kDebug()<<"/// MOVING TRS FROM: "<<(int)(m_tracksList.count() - m_startPos.y())<<", OFFSET: "<<(int) (m_dragItem->track() - m_startPos.y()); Transition *transition = (Transition *) m_dragItem; - m_document->renderer()->mltMoveTransition(transition->transitionName(), (int)(m_tracksList.count() - m_dragItemInfo.track), (int)(m_dragItemInfo.track - m_dragItem->track()), m_dragItemInfo.startPos, m_dragItemInfo.endPos, info.startPos, info.endPos); + m_document->renderer()->mltMoveTransition(transition->transitionTag(), (int)(m_tracksList.count() - m_dragItemInfo.track), (int)(m_dragItemInfo.track - m_dragItem->track()), m_dragItemInfo.startPos, m_dragItemInfo.endPos, info.startPos, info.endPos); } } else if (m_operationMode == RESIZESTART) { @@ -766,7 +766,7 @@ MoveTransitionCommand *command = new MoveTransitionCommand(this, m_dragItemInfo, info, false); m_commandStack->push(command); Transition *transition = (Transition *) m_dragItem; - m_document->renderer()->mltMoveTransition(transition->transitionName(), (int)(m_tracksList.count() - m_dragItemInfo.track), 0, m_dragItemInfo.startPos, m_dragItemInfo.endPos, info.startPos, info.endPos); + m_document->renderer()->mltMoveTransition(transition->transitionTag(), (int)(m_tracksList.count() - m_dragItemInfo.track), 0, m_dragItemInfo.startPos, m_dragItemInfo.endPos, info.startPos, info.endPos); } m_document->renderer()->doRefresh(); @@ -781,7 +781,7 @@ MoveTransitionCommand *command = new MoveTransitionCommand(this, m_dragItemInfo, info, false); m_commandStack->push(command); Transition *transition = (Transition *) m_dragItem; - m_document->renderer()->mltMoveTransition(transition->transitionName(), (int)(m_tracksList.count() - m_dragItemInfo.track), 0, m_dragItemInfo.startPos, m_dragItemInfo.endPos, info.startPos, info.endPos); + m_document->renderer()->mltMoveTransition(transition->transitionTag(), (int)(m_tracksList.count() - m_dragItemInfo.track), 0, m_dragItemInfo.startPos, m_dragItemInfo.endPos, info.startPos, info.endPos); } m_document->renderer()->doRefresh(); } @@ -893,7 +893,7 @@ item->resizeEnd((int) end.endPos.frames(m_document->fps()), m_scale); } //item->moveTransition(GenTime((int) (endPos.x() - startPos.x()), m_document->fps())); - m_document->renderer()->mltMoveTransition(item->transitionName(), m_tracksList.count() - start.track, start.track - end.track, start.startPos, start.endPos, end.startPos, end.endPos); + m_document->renderer()->mltMoveTransition(item->transitionTag(), m_tracksList.count() - start.track, start.track - end.track, start.startPos, start.endPos, end.startPos, end.endPos); } void CustomTrackView::resizeClip(const ItemInfo start, const ItemInfo end) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2008-03-27 22:55:07
|
Revision: 2132 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=2132&view=rev Author: j-b-m Date: 2008-03-27 15:55:09 -0700 (Thu, 27 Mar 2008) Log Message: ----------- Fix crash on timeline click Modified Paths: -------------- branches/KDE4/src/customtrackview.cpp Modified: branches/KDE4/src/customtrackview.cpp =================================================================== --- branches/KDE4/src/customtrackview.cpp 2008-03-27 22:50:43 UTC (rev 2131) +++ branches/KDE4/src/customtrackview.cpp 2008-03-27 22:55:09 UTC (rev 2132) @@ -420,9 +420,9 @@ collision = true; break; } + if (m_dragItem->type() == AVWIDGET) emit clipItemSelected((ClipItem*) m_dragItem); + else emit transitionItemSelected((Transition*) m_dragItem); } - if (m_dragItem->type() == AVWIDGET) emit clipItemSelected((ClipItem*) m_dragItem); - else emit transitionItemSelected((Transition*) m_dragItem); if (!collision) { kDebug() << "//////// NO ITEM FOUND ON CLICK"; m_dragItem = NULL; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2008-03-27 23:03:20
|
Revision: 2133 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=2133&view=rev Author: j-b-m Date: 2008-03-27 16:03:26 -0700 (Thu, 27 Mar 2008) Log Message: ----------- Fix the fix Modified Paths: -------------- branches/KDE4/src/customtrackview.cpp Modified: branches/KDE4/src/customtrackview.cpp =================================================================== --- branches/KDE4/src/customtrackview.cpp 2008-03-27 22:55:09 UTC (rev 2132) +++ branches/KDE4/src/customtrackview.cpp 2008-03-27 23:03:26 UTC (rev 2133) @@ -378,6 +378,7 @@ return; } else { bool collision = false; + m_dragItem = NULL; QList<QGraphicsItem *> collisionList = items(event->pos()); for (int i = 0; i < collisionList.size(); ++i) { QGraphicsItem *item = collisionList.at(i); @@ -420,9 +421,11 @@ collision = true; break; } + } + if (m_dragItem) { if (m_dragItem->type() == AVWIDGET) emit clipItemSelected((ClipItem*) m_dragItem); else emit transitionItemSelected((Transition*) m_dragItem); - } + } if (!collision) { kDebug() << "//////// NO ITEM FOUND ON CLICK"; m_dragItem = NULL; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ble...@us...> - 2008-03-28 00:24:13
|
Revision: 2135 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=2135&view=rev Author: blendamedt Date: 2008-03-27 17:24:20 -0700 (Thu, 27 Mar 2008) Log Message: ----------- fix selecting transition/effect enables widget Modified Paths: -------------- branches/KDE4/src/customtrackview.cpp Modified: branches/KDE4/src/customtrackview.cpp =================================================================== --- branches/KDE4/src/customtrackview.cpp 2008-03-27 23:46:53 UTC (rev 2134) +++ branches/KDE4/src/customtrackview.cpp 2008-03-28 00:24:20 UTC (rev 2135) @@ -378,7 +378,7 @@ return; } else { bool collision = false; - m_dragItem = NULL; + m_dragItem = NULL; QList<QGraphicsItem *> collisionList = items(event->pos()); for (int i = 0; i < collisionList.size(); ++i) { QGraphicsItem *item = collisionList.at(i); @@ -422,10 +422,9 @@ break; } } - if (m_dragItem) { - if (m_dragItem->type() == AVWIDGET) emit clipItemSelected((ClipItem*) m_dragItem); - else emit transitionItemSelected((Transition*) m_dragItem); - } + emit clipItemSelected((m_dragItem && m_dragItem->type() == AVWIDGET) ? (ClipItem*) m_dragItem : NULL); + emit transitionItemSelected((m_dragItem && m_dragItem->type() == TRANSITIONWIDGET) ? (Transition*) m_dragItem : NULL); + if (!collision) { kDebug() << "//////// NO ITEM FOUND ON CLICK"; m_dragItem = NULL; @@ -743,8 +742,8 @@ info.endPos = m_dragItem->endPos(); info.track = m_dragItem->track(); - if (m_operationMode == MOVE) setCursor(Qt::OpenHandCursor); if (m_operationMode == MOVE) {// && m_startPos.x() != m_dragItem->startPos().frames(m_document->fps())) { + setCursor(Qt::OpenHandCursor); // move clip if (m_dragItem->type() == AVWIDGET) { MoveClipCommand *command = new MoveClipCommand(this, m_dragItemInfo, info, false); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2008-03-28 10:27:46
|
Revision: 2138 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=2138&view=rev Author: j-b-m Date: 2008-03-28 03:27:52 -0700 (Fri, 28 Mar 2008) Log Message: ----------- keep vertical position when zooming Modified Paths: -------------- branches/KDE4/src/customtrackview.cpp Modified: branches/KDE4/src/customtrackview.cpp =================================================================== --- branches/KDE4/src/customtrackview.cpp 2008-03-28 09:39:44 UTC (rev 2137) +++ branches/KDE4/src/customtrackview.cpp 2008-03-28 10:27:52 UTC (rev 2138) @@ -968,6 +968,7 @@ //scale(scaleFactor, scaleFactor); double pos = cursorPos() / m_scale; m_scale = scaleFactor; + int vert = verticalScrollBar()->value(); kDebug() << " HHHHHHHH SCALING: " << m_scale; QList<QGraphicsItem *> itemList = items(); @@ -980,6 +981,7 @@ updateCursorPos(); centerOn(QPointF(cursorPos(), m_tracksHeight)); setSceneRect(0, 0, (m_projectDuration + 100) * m_scale, sceneRect().height()); + verticalScrollBar()->setValue(vert); } void CustomTrackView::drawBackground(QPainter * painter, const QRectF & rect) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ble...@us...> - 2008-03-31 19:18:53
|
Revision: 2152 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=2152&view=rev Author: blendamedt Date: 2008-03-31 12:18:58 -0700 (Mon, 31 Mar 2008) Log Message: ----------- better handling of transitionitem Modified Paths: -------------- branches/KDE4/src/customtrackview.cpp Modified: branches/KDE4/src/customtrackview.cpp =================================================================== --- branches/KDE4/src/customtrackview.cpp 2008-03-31 11:01:32 UTC (rev 2151) +++ branches/KDE4/src/customtrackview.cpp 2008-03-31 19:18:58 UTC (rev 2152) @@ -156,10 +156,11 @@ if (m_operationMode == MOVE && (event->pos() - m_clickEvent).manhattanLength() >= QApplication::startDragDistance()) { double snappedPos = getSnapPointForPos(mapToScene(event->pos()).x() - m_clickPoint.x()); //kDebug() << "/////// MOVE CLIP, EVENT Y: "<<m_clickPoint.y();//<<event->scenePos().y()<<", SCENE HEIGHT: "<<scene()->sceneRect().height(); - int moveTrack = (int) mapToScene(event->pos() + QPoint(0, (m_dragItem->type() == TRANSITIONWIDGET ? m_tracksHeight - m_clickPoint.y() : 0))).y() / m_tracksHeight; + int moveTrack = (int) mapToScene(event->pos() + QPoint(0, (m_dragItem->type() == TRANSITIONWIDGET ?/* m_tracksHeight*/ - m_clickPoint.y() : 0))).y() / m_tracksHeight; int currentTrack = m_dragItem->track(); - if (moveTrack > m_tracksList.count() - 1) moveTrack = m_tracksList.count() - 1; + if (moveTrack > 1000)moveTrack = 0; + else if (moveTrack > m_tracksList.count() - 1) moveTrack = m_tracksList.count() - 1; else if (moveTrack < 0) moveTrack = 0; int offset = moveTrack - currentTrack; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2008-04-11 15:12:37
|
Revision: 2164 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=2164&view=rev Author: j-b-m Date: 2008-04-11 08:12:32 -0700 (Fri, 11 Apr 2008) Log Message: ----------- Fix small track problem when adding clip to timeline Modified Paths: -------------- branches/KDE4/src/customtrackview.cpp Modified: branches/KDE4/src/customtrackview.cpp =================================================================== --- branches/KDE4/src/customtrackview.cpp 2008-04-11 15:07:52 UTC (rev 2163) +++ branches/KDE4/src/customtrackview.cpp 2008-04-11 15:12:32 UTC (rev 2164) @@ -651,7 +651,7 @@ event->setDropAction(Qt::IgnoreAction); kDebug() << "+++++++++++++ DRAG MOVE, : " << mapToScene(event->pos()).x() << ", SCAL: " << m_scale; if (m_dropItem) { - int track = (int)(event->pos().y() / m_tracksHeight); //) * (m_scale * 50) + m_scale; + int track = (int)(mapToScene(event->pos()).y() / m_tracksHeight); //) * (m_scale * 50) + m_scale; m_dropItem->moveTo((int)(mapToScene(event->pos()).x() / m_scale), m_scale, (int)((track - m_dropItem->track()) * m_tracksHeight), track); event->setDropAction(Qt::MoveAction); if (event->mimeData()->hasFormat("kdenlive/producerslist")) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2008-05-21 21:37:57
|
Revision: 2196 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=2196&view=rev Author: j-b-m Date: 2008-05-21 14:38:04 -0700 (Wed, 21 May 2008) Log Message: ----------- correctly update timeline after marker was added Modified Paths: -------------- branches/KDE4/src/customtrackview.cpp Modified: branches/KDE4/src/customtrackview.cpp =================================================================== --- branches/KDE4/src/customtrackview.cpp 2008-05-21 21:18:40 UTC (rev 2195) +++ branches/KDE4/src/customtrackview.cpp 2008-05-21 21:38:04 UTC (rev 2196) @@ -1132,6 +1132,8 @@ DocClipBase *base = m_document->clipManager()->getClipById(id); if (!comment.isEmpty()) base->addSnapMarker(pos, comment); else base->deleteSnapMarker(pos); + m_document->setModified(true); + viewport()->update(); } void CustomTrackView::setTool(PROJECTTOOL tool) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2008-06-02 20:11:51
|
Revision: 2216 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=2216&view=rev Author: j-b-m Date: 2008-06-02 13:11:59 -0700 (Mon, 02 Jun 2008) Log Message: ----------- Fix dropping effect on selected clip Modified Paths: -------------- branches/KDE4/src/customtrackview.cpp Modified: branches/KDE4/src/customtrackview.cpp =================================================================== --- branches/KDE4/src/customtrackview.cpp 2008-06-02 20:11:38 UTC (rev 2215) +++ branches/KDE4/src/customtrackview.cpp 2008-06-02 20:11:59 UTC (rev 2216) @@ -527,15 +527,14 @@ } void CustomTrackView::slotAddEffect(QDomElement effect, GenTime pos, int track) { - QList<QGraphicsItem *> itemList = scene()->selectedItems(); - if (track == -1) - itemList = items(); - else { + QList<QGraphicsItem *> itemList; + if (track == -1) itemList = scene()->selectedItems(); + if (itemList.isEmpty()) { ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, track); if (clip) itemList.append(clip); else kDebug() << "------ wrning, clip eff not found"; } - kDebug() << "// REQUESTING EFFECT ON CLIP: " << pos.frames(25) << ", TRK: " << track; + kDebug() << "// REQUESTING EFFECT ON CLIP: " << pos.frames(25) << ", TRK: " << track << "SELECTED ITEMS: "<<itemList.count(); for (int i = 0; i < itemList.count(); i++) { if (itemList.at(i)->type() == AVWIDGET) { ClipItem *item = (ClipItem *)itemList.at(i); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2008-06-02 21:06:01
|
Revision: 2218 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=2218&view=rev Author: j-b-m Date: 2008-06-02 14:06:03 -0700 (Mon, 02 Jun 2008) Log Message: ----------- Fix possible crash after transition deletion Modified Paths: -------------- branches/KDE4/src/customtrackview.cpp Modified: branches/KDE4/src/customtrackview.cpp =================================================================== --- branches/KDE4/src/customtrackview.cpp 2008-06-02 20:12:18 UTC (rev 2217) +++ branches/KDE4/src/customtrackview.cpp 2008-06-02 21:06:03 UTC (rev 2218) @@ -638,6 +638,7 @@ Transition *item = getTransitionItemAt((int)transitionInfo.startPos.frames(m_document->fps()) + 1, transitionInfo.track); m_document->renderer()->mltDeleteTransition(item->transitionTag(), endTrack, m_tracksList.count() - transitionInfo.track, transitionInfo.startPos, transitionInfo.endPos, item->toXML()); delete item; + emit transitionItemSelected(NULL); m_document->setModified(true); } @@ -968,7 +969,7 @@ } Transition *CustomTrackView::getTransitionItemAt(int pos, int track) { - QList<QGraphicsItem *> list = scene()->items(QPointF(pos * m_scale, track * m_tracksHeight + m_tracksHeight / 2)); + QList<QGraphicsItem *> list = scene()->items(QPointF(pos * m_scale, ( track + 1 ) * m_tracksHeight)); Transition *clip = NULL; for (int i = 0; i < list.size(); ++i) { if (list.at(i)->type() == TRANSITIONWIDGET) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2008-06-02 22:48:40
|
Revision: 2221 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=2221&view=rev Author: j-b-m Date: 2008-06-02 15:48:49 -0700 (Mon, 02 Jun 2008) Log Message: ----------- Disable transition settings if no transition is selected Modified Paths: -------------- branches/KDE4/src/customtrackview.cpp Modified: branches/KDE4/src/customtrackview.cpp =================================================================== --- branches/KDE4/src/customtrackview.cpp 2008-06-02 22:48:02 UTC (rev 2220) +++ branches/KDE4/src/customtrackview.cpp 2008-06-02 22:48:49 UTC (rev 2221) @@ -814,7 +814,10 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { QGraphicsView::mouseReleaseEvent(event); setDragMode(QGraphicsView::NoDrag); - if (m_dragItem == NULL) return; + if (m_dragItem == NULL) { + emit transitionItemSelected(NULL); + return; + } ItemInfo info; info.startPos = m_dragItem->startPos(); info.endPos = m_dragItem->endPos(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2008-06-08 21:02:12
|
Revision: 2235 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=2235&view=rev Author: j-b-m Date: 2008-06-08 14:02:21 -0700 (Sun, 08 Jun 2008) Log Message: ----------- Fix mid button playing in timeline Modified Paths: -------------- branches/KDE4/src/customtrackview.cpp Modified: branches/KDE4/src/customtrackview.cpp =================================================================== --- branches/KDE4/src/customtrackview.cpp 2008-06-08 13:44:32 UTC (rev 2234) +++ branches/KDE4/src/customtrackview.cpp 2008-06-08 21:02:21 UTC (rev 2235) @@ -152,21 +152,18 @@ } // virtual + void CustomTrackView::mouseMoveEvent(QMouseEvent * event) { int pos = event->x(); emit mousePosition((int)(mapToScene(event->pos()).x() / m_scale)); - /*if (event->modifiers() == Qt::ControlModifier) - setDragMode(QGraphicsView::ScrollHandDrag); - else if (event->modifiers() == Qt::ShiftModifier) - setDragMode(QGraphicsView::RubberBandDrag); - else*/ + if (event->buttons() & Qt::MidButton) return; { if (m_dragItem && m_tool == SELECTTOOL) { //event->button() == Qt::LeftButton) { // a button was pressed, delete visual tips if (m_operationMode == MOVE && (event->pos() - m_clickEvent).manhattanLength() >= QApplication::startDragDistance()) { double snappedPos = getSnapPointForPos(mapToScene(event->pos()).x() - m_clickPoint.x()); //kDebug() << "/////// MOVE CLIP, EVENT Y: "<<m_clickPoint.y();//<<event->scenePos().y()<<", SCENE HEIGHT: "<<scene()->sceneRect().height(); - int moveTrack = (int) mapToScene(event->pos() + QPoint(0, (m_dragItem->type() == TRANSITIONWIDGET ?/* m_tracksHeight*/ - m_clickPoint.y() : 0))).y() / m_tracksHeight; + int moveTrack = (int) mapToScene(event->pos() + QPoint(0, (m_dragItem->type() == TRANSITIONWIDGET ? - m_clickPoint.y() : 0))).y() / m_tracksHeight; int currentTrack = m_dragItem->track(); if (moveTrack > 1000)moveTrack = 0; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2008-06-10 22:01:52
|
Revision: 2246 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=2246&view=rev Author: j-b-m Date: 2008-06-10 15:02:00 -0700 (Tue, 10 Jun 2008) Log Message: ----------- Fix zoom centering Modified Paths: -------------- branches/KDE4/src/customtrackview.cpp Modified: branches/KDE4/src/customtrackview.cpp =================================================================== --- branches/KDE4/src/customtrackview.cpp 2008-06-10 21:35:28 UTC (rev 2245) +++ branches/KDE4/src/customtrackview.cpp 2008-06-10 22:02:00 UTC (rev 2246) @@ -1464,9 +1464,9 @@ m_guides.at(i)->updatePosition(m_scale); } + setSceneRect(0, 0, (m_projectDuration + 100) * m_scale, sceneRect().height()); updateCursorPos(); centerOn(QPointF(cursorPos(), m_tracksHeight)); - setSceneRect(0, 0, (m_projectDuration + 100) * m_scale, sceneRect().height()); verticalScrollBar()->setValue(vert); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |