From 6a28f464b903e9c2e6b41c25b2b62772a122117c Mon Sep 17 00:00:00 2001
From: Roman Telezhynskyi <kroluku@gmail.com>
Date: Fri, 15 Jan 2016 14:56:33 +0200
Subject: [PATCH] Fix recalculation the scene when move detail. (grafted from
 2a58800bc48bc82057c7bec08d007eb133849b5b)

--HG--
branch : develop
---
 src/libs/vtools/tools/vtooldetail.cpp       | 32 +++++++++++++++++----
 src/libs/vtools/undocommands/movedetail.cpp |  4 +++
 2 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/src/libs/vtools/tools/vtooldetail.cpp b/src/libs/vtools/tools/vtooldetail.cpp
index f18621b73..bf45dee5c 100644
--- a/src/libs/vtools/tools/vtooldetail.cpp
+++ b/src/libs/vtools/tools/vtooldetail.cpp
@@ -346,14 +346,34 @@ void VToolDetail::RefreshDataInFile()
  */
 QVariant VToolDetail::itemChange(QGraphicsItem::GraphicsItemChange change, const QVariant &value)
 {
-    if (change == ItemPositionHasChanged && scene())
+    if (change == ItemPositionChange && scene())
     {
-        // value - this is new position.
-        QPointF newPos = value.toPointF();
+        // Each time we move something we call recalculation scene rect. In some cases this can cause moving
+        // objects positions. And this cause infinite redrawing. That's why we wait the finish of saving the last move.
+        static bool changeFinished = true;
+        if (changeFinished)
+        {
+           changeFinished = false;
 
-        MoveDetail *moveDet = new MoveDetail(doc, newPos.x(), newPos.y(), id, this->scene());
-        connect(moveDet, &MoveDetail::NeedLiteParsing, doc, &VAbstractPattern::LiteParseTree);
-        qApp->getUndoStack()->push(moveDet);
+           // value - this is new position.
+           const QPointF newPos = value.toPointF();
+
+           MoveDetail *moveDet = new MoveDetail(doc, newPos.x(), newPos.y(), id, scene());
+           connect(moveDet, &MoveDetail::NeedLiteParsing, doc, &VAbstractPattern::LiteParseTree);
+           qApp->getUndoStack()->push(moveDet);
+
+           const QList<QGraphicsView *> viewList = scene()->views();
+           if (not viewList.isEmpty())
+           {
+               if (QGraphicsView *view = viewList.at(0))
+               {
+                   view->ensureVisible(mapToScene(boundingRect()|childrenBoundingRect()).boundingRect());
+               }
+           }
+           // Don't forget to update geometry, because first change never call full parse
+           RefreshGeometry();
+           changeFinished = true;
+        }
     }
 
     if (change == QGraphicsItem::ItemSelectedChange)
diff --git a/src/libs/vtools/undocommands/movedetail.cpp b/src/libs/vtools/undocommands/movedetail.cpp
index 87e15a4f1..2b809e8b3 100644
--- a/src/libs/vtools/undocommands/movedetail.cpp
+++ b/src/libs/vtools/undocommands/movedetail.cpp
@@ -92,6 +92,10 @@ void MoveDetail::redo()
         {
             emit NeedLiteParsing(Document::LiteParse);
         }
+        else
+        {
+            VMainGraphicsView::NewSceneRect(scene, qApp->getSceneView());
+        }
         redoFlag = true;
     }
     else