#include <QStyleOptionGraphicsItem>
#include <QDomDocument>
#include <QMimeData>
-
+#include <QGraphicsSceneMouseEvent>
AbstractGroupItem::AbstractGroupItem(double /* fps */) :
QObject(),
QGraphicsItemGroup()
{
- setZValue(2);
- setFlags(QGraphicsItem::ItemClipsToShape | QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
+ setZValue(1);
+ setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
setAcceptDrops(true);
}
return NULL;
}
-QPainterPath AbstractGroupItem::groupShape(QPointF offset)
+QPainterPath AbstractGroupItem::clipGroupShape(QPointF offset) const
{
QPainterPath path;
QList<QGraphicsItem *> children = childItems();
return path;
}
+QPainterPath AbstractGroupItem::transitionGroupShape(QPointF offset) const
+{
+ QPainterPath path;
+ QList<QGraphicsItem *> children = childItems();
+ for (int i = 0; i < children.count(); i++) {
+ if (children.at(i)->type() == TRANSITIONWIDGET) {
+ QRectF r(children.at(i)->sceneBoundingRect());
+ r.translate(offset);
+ path.addRect(r);
+ }
+ }
+ return path;
+}
+
void AbstractGroupItem::addItem(QGraphicsItem * item)
{
addToGroup(item);
void AbstractGroupItem::paint(QPainter *p, const QStyleOptionGraphicsItem *option, QWidget *)
{
const double scale = option->matrix.m11();
- QRect clipRect = option->exposedRect.toRect();
- clipRect.adjust(0, 0, 1 / scale + 0.5, 1);
- p->fillRect(option->exposedRect, QColor(100, 100, 200, 100));
- p->setClipRect(clipRect);
+ QColor bgcolor(100, 100, 200, 100);
+ QRectF bound = option->exposedRect.adjusted(0, 0, 1, 1);
+ p->setClipRect(bound);
+ p->fillRect(option->exposedRect, bgcolor);
QPen pen = p->pen();
pen.setColor(QColor(200, 90, 90));
pen.setStyle(Qt::DashLine);
+ pen.setWidthF(0.0);
+ //pen.setCosmetic(true);
p->setPen(pen);
- p->drawRect(boundingRect());
+ p->drawRect(boundingRect().adjusted(0, 0, - 1 / scale, 0));
}
//virtual
QVariant AbstractGroupItem::itemChange(GraphicsItemChange change, const QVariant &value)
{
- if (change == ItemPositionChange && scene()) {
+ if (change == ItemPositionChange && scene() && parentItem() == 0) {
// calculate new position.
const int trackHeight = KdenliveSettings::trackheight();
QPointF start = sceneBoundingRect().topLeft();
offset = (int)(trackHeight / 3 * 2 - 1);
topTrack = currentTrack;
}
+ } else if (children.at(i)->type() == GROUPWIDGET) {
+ QList<QGraphicsItem *> subchildren = children.at(i)->childItems();
+ bool clipGroup = false;
+ for (int j = 0; j < subchildren.count(); j++) {
+ if (subchildren.at(j)->type() == AVWIDGET) {
+ clipGroup = true;
+ break;
+ }
+ }
+ if (clipGroup) {
+ if (topTrack == -1 || currentTrack <= topTrack) {
+ offset = 0;
+ topTrack = currentTrack;
+ }
+ } else {
+ if (topTrack == -1 || currentTrack < topTrack) {
+ offset = (int)(trackHeight / 3 * 2 - 1);
+ topTrack = currentTrack;
+ }
+ }
}
}
newPos.setY((int)((proposedTrack) * trackHeight) + offset);
// If group goes below 0, adjust position to 0
return QPointF(pos().x() - start.x(), pos().y());
}*/
- QPainterPath shape = groupShape(newPos - pos());
+
+ QPainterPath shape = clipGroupShape(newPos - pos());
QList<QGraphicsItem*> collindingItems = scene()->items(shape, Qt::IntersectsItemShape);
for (int i = 0; i < children.count(); i++) {
collindingItems.removeAll(children.at(i));
}
- if (collindingItems.isEmpty()) return newPos;
- else {
+ if (!collindingItems.isEmpty()) {
bool forwardMove = xpos > start.x();
int offset = 0;
for (int i = 0; i < collindingItems.count(); i++) {
QGraphicsItem *collision = collindingItems.at(i);
if (collision->type() == AVWIDGET) {
// Collision
- //kDebug()<<"// COLLISION WIT:"<<collision->sceneBoundingRect();
if (newPos.y() != pos().y()) {
// Track change results in collision, restore original position
return pos();
newPos.setX(newPos.x() + offset);
}
// If there is still a collision after our position adjust, restore original pos
- collindingItems = scene()->items(groupShape(newPos - pos()), Qt::IntersectsItemShape);
+ collindingItems = scene()->items(clipGroupShape(newPos - pos()), Qt::IntersectsItemShape);
for (int i = 0; i < children.count(); i++) {
collindingItems.removeAll(children.at(i));
}
for (int i = 0; i < collindingItems.count(); i++)
if (collindingItems.at(i)->type() == AVWIDGET) return pos();
}
- return newPos;
}
+
+
+ shape = transitionGroupShape(newPos - pos());
+ collindingItems = scene()->items(shape, Qt::IntersectsItemShape);
+ for (int i = 0; i < children.count(); i++) {
+ collindingItems.removeAll(children.at(i));
+ }
+ if (collindingItems.isEmpty()) return newPos;
+ else {
+ bool forwardMove = xpos > start.x();
+ int offset = 0;
+ for (int i = 0; i < collindingItems.count(); i++) {
+ QGraphicsItem *collision = collindingItems.at(i);
+ if (collision->type() == TRANSITIONWIDGET) {
+ // Collision
+ if (newPos.y() != pos().y()) {
+ // Track change results in collision, restore original position
+ return pos();
+ }
+ AbstractClipItem *item = static_cast <AbstractClipItem *>(collision);
+ if (forwardMove) {
+ // Moving forward, determine best pos
+ QPainterPath clipPath;
+ clipPath.addRect(item->sceneBoundingRect());
+ QPainterPath res = shape.intersected(clipPath);
+ offset = qMax(offset, (int)(res.boundingRect().width() + 0.5));
+ } else {
+ // Moving backward, determine best pos
+ QPainterPath clipPath;
+ clipPath.addRect(item->sceneBoundingRect());
+ QPainterPath res = shape.intersected(clipPath);
+ offset = qMax(offset, (int)(res.boundingRect().width() + 0.5));
+ }
+ }
+ }
+ if (offset > 0) {
+ if (forwardMove) {
+ newPos.setX(newPos.x() - offset);
+ } else {
+ newPos.setX(newPos.x() + offset);
+ }
+ // If there is still a collision after our position adjust, restore original pos
+ collindingItems = scene()->items(transitionGroupShape(newPos - pos()), Qt::IntersectsItemShape);
+ for (int i = 0; i < children.count(); i++) {
+ collindingItems.removeAll(children.at(i));
+ }
+ for (int i = 0; i < collindingItems.count(); i++)
+ if (collindingItems.at(i)->type() == TRANSITIONWIDGET) return pos();
+ }
+ }
+ return newPos;
}
return QGraphicsItemGroup::itemChange(change, value);
}
{
Q_UNUSED(event);
}
+
+// virtual
+void AbstractGroupItem::mousePressEvent(QGraphicsSceneMouseEvent * event)
+{
+ if (event->modifiers() & Qt::ShiftModifier) {
+ // User want to do a rectangle selection, so ignore the event to pass it to the view
+ event->ignore();
+ } else QGraphicsItem::mousePressEvent(event);
+}
projects / kdenlive / blobdiff