Remove support for non-OpenGL main monitor.

[kdenlive] / src / onmonitoritems / onmonitorrectitem.cpp

diff --git a/src/onmonitoritems/onmonitorrectitem.cpp b/src/onmonitoritems/onmonitorrectitem.cpp
index 20152e6fca4de6e398ec38d44008ea7a546e0999..fc1b822da8f1c25d4117f97ae93991ba60963cc4 100644 (file)
--- a/src/onmonitoritems/onmonitorrectitem.cpp
+++ b/src/onmonitoritems/onmonitorrectitem.cpp
@@ -27,10 +27,11 @@
 #include <QGraphicsView>
 
 OnMonitorRectItem::OnMonitorRectItem(const QRectF &rect, double dar, QGraphicsItem* parent) :
-        QGraphicsRectItem(rect, parent),
-        m_dar(dar),
-        m_modified(false),
-        m_view(NULL)
+    QGraphicsRectItem(rect, parent)
+  , m_dar(dar)
+  , m_mode(NoAction)
+  , m_modified(false)
+  , m_view(NULL)
 {
     setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
 
@@ -41,7 +42,7 @@ OnMonitorRectItem::OnMonitorRectItem(const QRectF &rect, double dar, QGraphicsIt
     setAcceptHoverEvents(true);
 }
 
-rectActions OnMonitorRectItem::getMode(QPointF pos)
+rectActions OnMonitorRectItem::getMode(const QPointF &pos)
 {
     // Item mapped coordinates
     QPolygonF pol(rect().normalized());
@@ -60,7 +61,7 @@ rectActions OnMonitorRectItem::getMode(QPointF pos)
     qreal ysize = 12;
     if (getView()) {
         xsize /= m_view->matrix().m11();
-       ysize /= m_view->matrix().m22();
+        ysize /= m_view->matrix().m22();
     }
     mouseArea.addRect(pos.x() - xsize / 2, pos.y() - ysize / 2, xsize, ysize);
 
@@ -175,7 +176,7 @@ void OnMonitorRectItem::mouseMoveEvent(QGraphicsSceneMouseEvent* event)
 
         // Keep aspect ratio
         if (event->modifiers() == Qt::ControlModifier) {
-            // compare to rect during mouse press: 
+            // compare to rect during mouse press:
             // if we subtract rect() we'll get a whole lot of flickering
             // because of diffWidth > diffHeight changing all the time
             int diffWidth = qAbs(r.width() - m_oldRect.width());
@@ -262,27 +263,28 @@ void OnMonitorRectItem::hoverMoveEvent(QGraphicsSceneHoverEvent* event)
 void OnMonitorRectItem::paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget)
 {
     Q_UNUSED(widget)
+    Q_UNUSED(option)
 
     painter->setPen(pen());
-    painter->drawRect(option->rect);
-    const QRectF r = painter->worldTransform().mapRect(option->rect);
-    painter->setWorldMatrixEnabled(false);
+    //painter->setClipRect(option->rect);
+    const QRectF r = rect();
+    painter->drawRect(r);
+    QRectF handle = painter->worldTransform().inverted().mapRect(QRectF(0, 0, 6, 6));
     if (isEnabled()) {
-       QRectF handle(0, 0, 6, 6);
-       handle.moveTopLeft(r.topLeft());
+        handle.moveTopLeft(r.topLeft());
         painter->fillRect(handle, QColor(Qt::yellow));
-       handle.moveTopRight(r.topRight());
+        handle.moveTopRight(r.topRight());
         painter->fillRect(handle, QColor(Qt::yellow));
-       handle.moveBottomLeft(r.bottomLeft());
+        handle.moveBottomLeft(r.bottomLeft());
         painter->fillRect(handle, QColor(Qt::yellow));
-       handle.moveBottomRight(r.bottomRight());
+        handle.moveBottomRight(r.bottomRight());
         painter->fillRect(handle, QColor(Qt::yellow));
     }
     
     // Draw cross at center
     QPointF center = r.center();
-    painter->drawLine(center + QPointF(-6, 0), center + QPointF(6, 0));
-    painter->drawLine(center + QPointF(0, 6), center + QPointF(0, -6));
+    painter->drawLine(center + QPointF(-handle.width(), 0), center + QPointF(handle.width(), 0));
+    painter->drawLine(center + QPointF(0, handle.height()), center + QPointF(0, -handle.height()));
 }
 
 bool OnMonitorRectItem::getView()
@@ -290,8 +292,8 @@ bool OnMonitorRectItem::getView()
     if (m_view)
         return true;
 
-    if (scene() && scene()->views().count()) {
-        m_view = scene()->views()[0];
+    if (scene() && !scene()->views().isEmpty()) {
+        m_view = scene()->views().first();
         return true;
     } else {
         return false;