[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdenlive] src: Merge branch '16.12'
From:       Jean-Baptiste Mardelle <null () kde ! org>
Date:       2016-12-15 21:58:50
Message-ID: E1cHe38-0005g5-1Y () code ! kde ! org
[Download RAW message or body]

Git commit 5decf0f94081f8fd1ccc901252ac90c1d6625fcb by Jean-Baptiste Mardelle.
Committed on 15/12/2016 at 21:56.
Pushed by mardelle into branch 'master'.

Merge branch '16.12'

M  +28   -15   src/effectstack/graphicsscenerectmove.cpp
M  +17   -13   src/monitor/glwidget.cpp
M  +5    -2    src/monitor/monitor.cpp

https://commits.kde.org/kdenlive/5decf0f94081f8fd1ccc901252ac90c1d6625fcb

diff --cc src/effectstack/graphicsscenerectmove.cpp
index d05eb5787,c2f526c45..53a7aa2d3
--- a/src/effectstack/graphicsscenerectmove.cpp
+++ b/src/effectstack/graphicsscenerectmove.cpp
@@@ -598,12 -577,11 +599,13 @@@ void GraphicsSceneRectMove::mouseDouble
  
  void GraphicsSceneRectMove::mouseReleaseEvent(QGraphicsSceneMouseEvent *e)
  {
+     m_pan = false;
 -    if (m_tool == TITLE_RECTANGLE && m_selectedItem) \
setSelectedItem(m_selectedItem);  +    if (m_tool == TITLE_RECTANGLE && \
m_selectedItem) {  +        setSelectedItem(m_selectedItem);
 +    }
      if (m_createdText) {
          m_selectedItem->setSelected(true);
 -        MyTextItem *newText = static_cast<MyTextItem*>(m_selectedItem);
 +        MyTextItem *newText = static_cast<MyTextItem *>(m_selectedItem);
          QTextCursor cur(newText->document());
          cur.select(QTextCursor::Document);
          newText->setTextCursor(cur);
@@@ -621,8 -599,19 +623,19 @@@
      emit actionFinished();
  }
  
 -void GraphicsSceneRectMove::mousePressEvent(QGraphicsSceneMouseEvent* e)
 +void GraphicsSceneRectMove::mousePressEvent(QGraphicsSceneMouseEvent *e)
  {
+     if (e->buttons() & Qt::MiddleButton) {
+         clearTextSelection();
+         QList<QGraphicsView*> viewlist = views();
+         if (!viewlist.isEmpty()) {
+             viewlist.first()->setDragMode(QGraphicsView::ScrollHandDrag);
+             m_pan = true;
+             e->accept();
+             QGraphicsScene::mousePressEvent(e);
+             return;
+         }
+     }
      int xPos = ((int) e->scenePos().x() / m_gridSize) * m_gridSize;
      int yPos = ((int) e->scenePos().y() / m_gridSize) * m_gridSize;
      m_moveStarted = false;
@@@ -746,16 -733,23 +758,23 @@@ void GraphicsSceneRectMove::clearTextSe
      clearSelection();
  }
  
 -void GraphicsSceneRectMove::mouseMoveEvent(QGraphicsSceneMouseEvent* e)
 +void GraphicsSceneRectMove::mouseMoveEvent(QGraphicsSceneMouseEvent *e)
  {
+     QList<QGraphicsView*> viewlist = views();
+     if (viewlist.isEmpty()) {
+         e->ignore();
+         return;
+     }
+     QGraphicsView *view = viewlist.first();
+     if (m_pan) {
+         QPoint diff = e->lastScreenPos() - e->screenPos();
+         view->horizontalScrollBar()->setValue(view->horizontalScrollBar()->value() \
+ diff.x()); +         \
view->verticalScrollBar()->setValue(view->verticalScrollBar()->value() + diff.y()); + \
e->accept(); +         QGraphicsScene::mouseMoveEvent(e);
+         return;
+     }
      if (e->buttons() != Qt::NoButton && !m_moveStarted) {
-         QList<QGraphicsView *> viewlist = views();
-         if (viewlist.isEmpty()) {
-             // invalid
-             e->accept();
-             return;
-         }
-         QGraphicsView *view = viewlist.at(0);
          if ((view->mapFromScene(e->scenePos()) - \
view->mapFromScene(m_clickPoint)).manhattanLength() < \
QApplication::startDragDistance()) {  e->ignore();
              QGraphicsScene::mouseMoveEvent(e);
diff --cc src/monitor/glwidget.cpp
index 120042b61,cd4f56add..81439a729
--- a/src/monitor/glwidget.cpp
+++ b/src/monitor/glwidget.cpp
@@@ -567,9 -569,10 +567,9 @@@ void GLWidget::wheelEvent(QWheelEvent *
      event->accept();
  }
  
 -
 -void GLWidget::mousePressEvent(QMouseEvent* event)
 +void GLWidget::mousePressEvent(QMouseEvent *event)
  {
-     if (rootObject() && rootObject()->objectName() != QLatin1String("root") && \
!(event->modifiers() & Qt::ControlModifier)) { +     if (rootObject() && \
rootObject()->objectName() != QLatin1String("root") && !(event->modifiers() & \
Qt::ControlModifier) && !(event->buttons() & Qt::MiddleButton)) {  event->ignore();
          QQuickView::mousePressEvent(event);
          return;
@@@ -591,9 -596,9 +593,9 @@@
      QQuickView::mousePressEvent(event);
  }
  
 -void GLWidget::mouseMoveEvent(QMouseEvent* event)
 +void GLWidget::mouseMoveEvent(QMouseEvent *event)
  {
-     if (rootObject() && rootObject()->objectName() != QLatin1String("root") && \
!(event->modifiers() & Qt::ControlModifier)) { +     if (rootObject() && \
rootObject()->objectName() != QLatin1String("root") && !(event->modifiers() & \
Qt::ControlModifier) && !(event->buttons() & Qt::MiddleButton)) {  event->ignore();
          QQuickView::mouseMoveEvent(event);
          return;
@@@ -606,19 -619,13 +616,13 @@@
          QQuickView::mouseMoveEvent(event);
          return;
      }
-     if (!m_dragStart.isNull() && (event->pos() - m_dragStart).manhattanLength() >= \
                QApplication::startDragDistance()) {
 -    if (!event->isAccepted() && !m_dragStart.isNull() &&  (event->pos() - \
m_dragStart).manhattanLength() >= QApplication::startDragDistance()) { ++    if \
(!event->isAccepted() && !m_dragStart.isNull() && (event->pos() - \
m_dragStart).manhattanLength() >= QApplication::startDragDistance()) {  m_dragStart = \
QPoint();  emit startDrag();
      }
-     if (!m_panStart.isNull()) {
-         emit panView(m_panStart - event->pos());
-         m_panStart = event->pos();
-         event->accept();
-     }
-     QQuickView::mouseMoveEvent(event);
  }
  
 -void GLWidget::keyPressEvent(QKeyEvent* event)
 +void GLWidget::keyPressEvent(QKeyEvent *event)
  {
      QQuickView::keyPressEvent(event);
      if (!event->isAccepted()) {


[prev in list] [next in list] [prev in thread] [next in thread]