Display "Waiting for data" properly

Display "Waiting for data" instead of "No differences" when creating new
instance of an editor for the same document (e.g. by splitting the view)
during document reload.

Change-Id: If254006de3914ad4416c7405874e8cbea57ddd8d
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>

1 files changed, 11 insertions, 2 deletions

diff --git a/src/plugins/diffeditor/diffview.cpp b/src/plugins/diffeditor/diffview.cpp
index c8f1b8dea9..8ad5339594 100644
--- a/src/plugins/diffeditor/diffview.cpp
+++ b/src/plugins/diffeditor/diffview.cpp
@@ -25,6 +25,7 @@
 
 #include "diffview.h"
 
+#include "diffeditordocument.h"
 #include "diffeditoricons.h"
 #include "unifieddiffeditorwidget.h"
 #include "sidebysidediffeditorwidget.h"
@@ -110,12 +111,16 @@ void UnifiedView::setDocument(DiffEditorDocument *document)
 {
     QTC_ASSERT(m_widget, return);
     m_widget->setDocument(document);
+    if (document && document->isReloading())
+        m_widget->clear(tr("Waiting for data..."));
 }
 
 void UnifiedView::beginOperation()
 {
     QTC_ASSERT(m_widget, return);
-    m_widget->saveState();
+    DiffEditorDocument *document = m_widget->diffDocument();
+    if (document && !document->isReloading())
+        m_widget->saveState();
     m_widget->clear(tr("Waiting for data..."));
 }
 
@@ -169,12 +174,16 @@ void SideBySideView::setDocument(DiffEditorDocument *document)
 {
     QTC_ASSERT(m_widget, return);
     m_widget->setDocument(document);
+    if (document && document->isReloading())
+        m_widget->clear(tr("Waiting for data..."));
 }
 
 void SideBySideView::beginOperation()
 {
     QTC_ASSERT(m_widget, return);
-    m_widget->saveState();
+    DiffEditorDocument *document = m_widget->diffDocument();
+    if (document && !document->isReloading())
+        m_widget->saveState();
     m_widget->clear(tr("Waiting for data..."));
 }