int AbstractGroupItem::track() const
{
- return (int)(scenePos().y() / KdenliveSettings::trackheight());
+ //return (int)(scenePos().y() / KdenliveSettings::trackheight());
+ int topTrack = -1;
+ QList<QGraphicsItem *> children = childItems();
+ for (int i = 0; i < children.count(); ++i) {
+ if (children.at(i)->type() == GROUPWIDGET) {
+ children.append(children.at(i)->childItems());
+ continue;
+ }
+ AbstractClipItem *item = static_cast <AbstractClipItem *>(children.at(i));
+ if (item && (topTrack == -1 || topTrack > item->track())) {
+ topTrack = item->track();
+ }
+ }
+ return topTrack;
}
void AbstractGroupItem::setItemLocked(bool locked)
QColor bgcolor(100, 100, 200, 100);
QRectF bound = option->exposedRect.adjusted(0, 0, 1, 1);
p->setClipRect(bound);
- const QRectF mapped = p->worldTransform().mapRect(option->exposedRect);
- p->setWorldMatrixEnabled(false);
p->setBrush(bgcolor);
QPen pen = p->pen();
pen.setColor(QColor(200, 90, 90));
pen.setStyle(Qt::DashLine);
pen.setWidthF(0.0);
p->setPen(pen);
- p->drawRoundedRect(mapped, 3, 3);
+ p->drawRoundedRect(boundingRect().adjusted(0, 0, -1, 0), 3, 3);
}
//virtual
xpos = qMax(xpos, 0);
//kDebug()<<"GRP XPOS:"<<xpos<<", START:"<<start.x()<<",NEW:"<<newPos.x()<<"; SCENE:"<<scenePos().x()<<",POS:"<<pos().x();
newPos.setX((int)(pos().x() + xpos - (int) start.x()));
-
- int yOffset = property("y_absolute").toInt() + newPos.y();
- int proposedTrack = yOffset / trackHeight;
-
+ QStringList lockedTracks = property("locked_tracks").toStringList();
+ int proposedTrack = (property("y_absolute").toInt() + newPos.y()) / trackHeight;
// Check if top item is a clip or a transition
int offset = 0;
int topTrack = -1;
+ QList<int> groupTracks;
QList<QGraphicsItem *> children = childItems();
for (int i = 0; i < children.count(); i++) {
int currentTrack = 0;
- if (children.at(i)->type() == AVWIDGET || children.at(i)->type() == TRANSITIONWIDGET) currentTrack = static_cast <AbstractClipItem*> (children.at(i))->track();
- else if (children.at(i)->type() == GROUPWIDGET) currentTrack = static_cast <AbstractGroupItem*> (children.at(i))->track();
+ if (children.at(i)->type() == AVWIDGET || children.at(i)->type() == TRANSITIONWIDGET) {
+ currentTrack = static_cast <AbstractClipItem*> (children.at(i))->track();
+ if (!groupTracks.contains(currentTrack)) groupTracks.append(currentTrack);
+ }
+ else if (children.at(i)->type() == GROUPWIDGET) {
+ currentTrack = static_cast <AbstractGroupItem*> (children.at(i))->track();
+ }
else continue;
if (children.at(i)->type() == AVWIDGET) {
if (topTrack == -1 || currentTrack <= topTrack) {
QList<QGraphicsItem *> subchildren = children.at(i)->childItems();
bool clipGroup = false;
for (int j = 0; j < subchildren.count(); j++) {
- if (subchildren.at(j)->type() == AVWIDGET) {
+ if (subchildren.at(j)->type() == AVWIDGET || subchildren.at(j)->type() == TRANSITIONWIDGET) {
+ int subTrack = static_cast <AbstractClipItem*> (subchildren.at(j))->track();
+ if (!groupTracks.contains(subTrack)) groupTracks.append(subTrack);
clipGroup = true;
- break;
}
}
if (clipGroup) {
}
}
}
+ // Check no clip in the group goes outside of existing tracks
+ int maximumTrack = projectScene()->tracksCount() - 1;
+ int groupHeight = 0;
+ for (int i = 0; i < groupTracks.count(); i++) {
+ int offset = groupTracks.at(i) - topTrack;
+ if (offset > groupHeight) groupHeight = offset;
+ }
+ maximumTrack -= groupHeight;
+ proposedTrack = qMin(proposedTrack, maximumTrack);
+ proposedTrack = qMax(proposedTrack, 0);
+ int groupOffset = proposedTrack - topTrack;
+ if (!lockedTracks.isEmpty()) {
+ for (int i = 0; i < groupTracks.count(); i++) {
+ if (lockedTracks.contains(QString::number(groupTracks.at(i) + groupOffset))) {
+ return pos();
+ }
+ }
+ }
newPos.setY((int)((proposedTrack) * trackHeight) + offset);
//if (newPos == start) return start;