Various fixes to improve general stability in Qt 4.5.2

[kdenlive] / src / abstractgroupitem.cpp

diff --git a/src/abstractgroupitem.cpp b/src/abstractgroupitem.cpp
index 756e29431c2852aa33075552710227b5b44217d6..a54cd93f3a334c458b76da7da9caade6506b8704 100644 (file)
--- a/src/abstractgroupitem.cpp
+++ b/src/abstractgroupitem.cpp
@@ -30,14 +30,14 @@
 #include <QStyleOptionGraphicsItem>
 #include <QDomDocument>
 #include <QMimeData>
+#include <QGraphicsSceneMouseEvent>
 
-
-AbstractGroupItem::AbstractGroupItem(double fps) :
-        QGraphicsItemGroup(),
-        m_fps(fps)
+AbstractGroupItem::AbstractGroupItem(double /* fps */) :
+        QObject(),
+        QGraphicsItemGroup()
 {
-    setZValue(2);
-    setFlags(QGraphicsItem::ItemClipsToShape | QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
+    setZValue(1);
+    setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
     setAcceptDrops(true);
 }
 
@@ -97,15 +97,16 @@ void AbstractGroupItem::fixItemRect()
 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);
+    p->fillRect(option->exposedRect, bgcolor);
+    p->setClipping(false);
     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
@@ -234,3 +235,12 @@ void AbstractGroupItem::dragLeaveEvent(QGraphicsSceneDragDropEvent *event)
 {
     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);
+}