From e69ac60d08bc7424e1713d39fbfd8513c6ef5dca Mon Sep 17 00:00:00 2001
From: Black Hat <bhat@encom.eu.org>
Date: Sun, 7 Oct 2018 20:38:30 +0800
Subject: [PATCH] Add back busy indicator.

---
 imports/Spectral/Component/Timeline/GenericBubble.qml |  2 +-
 imports/Spectral/Panel/RoomHeader.qml                 | 10 ++++++++++
 imports/Spectral/Panel/RoomPanelForm.ui.qml           |  8 --------
 src/spectralroom.cpp                                  | 10 +++++++---
 src/spectralroom.h                                    |  2 ++
 5 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/imports/Spectral/Component/Timeline/GenericBubble.qml b/imports/Spectral/Component/Timeline/GenericBubble.qml
index ae778a3..cc33245 100644
--- a/imports/Spectral/Component/Timeline/GenericBubble.qml
+++ b/imports/Spectral/Component/Timeline/GenericBubble.qml
@@ -31,7 +31,7 @@ Control {
 
         layer.enabled: true
         layer.effect: ElevationEffect {
-            elevation: 2
+            elevation: 1
         }
     }
 }
diff --git a/imports/Spectral/Panel/RoomHeader.qml b/imports/Spectral/Panel/RoomHeader.qml
index 5532967..0be4291 100644
--- a/imports/Spectral/Panel/RoomHeader.qml
+++ b/imports/Spectral/Panel/RoomHeader.qml
@@ -66,4 +66,14 @@ Rectangle {
             }
         }
     }
+
+    ProgressBar {
+        width: parent.width
+        z: 10
+        anchors.bottom: parent.bottom
+
+        Material.accent: "white"
+        visible: currentRoom && currentRoom.busy
+        indeterminate: true
+    }
 }
diff --git a/imports/Spectral/Panel/RoomPanelForm.ui.qml b/imports/Spectral/Panel/RoomPanelForm.ui.qml
index 692bd49..d55d395 100644
--- a/imports/Spectral/Panel/RoomPanelForm.ui.qml
+++ b/imports/Spectral/Panel/RoomPanelForm.ui.qml
@@ -65,14 +65,6 @@ Item {
             id: roomHeader
         }
 
-        ProgressBar {
-            Layout.fillWidth: true
-            z: 10
-
-            visible: currentRoom && currentRoom.busy
-            indeterminate: true
-        }
-
         ListView {
             Layout.fillWidth: true
             Layout.fillHeight: true
diff --git a/src/spectralroom.cpp b/src/spectralroom.cpp
index 789a6c7..57966bf 100644
--- a/src/spectralroom.cpp
+++ b/src/spectralroom.cpp
@@ -8,8 +8,8 @@
 #include "events/typingevent.h"
 
 #include <QFileDialog>
-#include <QMimeDatabase>
 #include <QMetaObject>
+#include <QMimeDatabase>
 
 SpectralRoom::SpectralRoom(Connection* connection, QString roomId,
                            JoinState joinState)
@@ -18,8 +18,7 @@ SpectralRoom::SpectralRoom(Connection* connection, QString roomId,
           &SpectralRoom::countChanged);
   connect(this, &SpectralRoom::highlightCountChanged, this,
           &SpectralRoom::countChanged);
-  connect(this, &Room::addedMessages, this,
-          [=] { setBusy(false); });
+  connect(this, &Room::addedMessages, this, [=] { setBusy(false); });
 }
 
 void SpectralRoom::chooseAndUploadFile() {
@@ -178,3 +177,8 @@ void SpectralRoom::saveViewport(int topIndex, int bottomIndex) {
   setFirstDisplayedEvent(maxTimelineIndex() - topIndex);
   setLastDisplayedEvent(maxTimelineIndex() - bottomIndex);
 }
+
+void SpectralRoom::getPreviousContent(int limit) {
+  setBusy(true);
+  Room::getPreviousContent(limit);
+}
diff --git a/src/spectralroom.h b/src/spectralroom.h
index 7b3c9eb..75441a1 100644
--- a/src/spectralroom.h
+++ b/src/spectralroom.h
@@ -52,6 +52,8 @@ class SpectralRoom : public Room {
   Q_INVOKABLE int savedBottomVisibleIndex() const;
   Q_INVOKABLE void saveViewport(int topIndex, int bottomIndex);
 
+  Q_INVOKABLE void getPreviousContent(int limit = 10);
+
  private:
   QString m_cachedInput;
   QSet<const QMatrixClient::RoomEvent*> highlights;