hide progress bar when not actually mid-upload

3 files changed, 37 insertions, 3 deletions

diff --git a/src/components/chatwindow.cpp b/src/components/chatwindow.cpp
index aeed4ed..9a2493d 100644
--- a/src/components/chatwindow.cpp
+++ b/src/components/chatwindow.cpp
@@ -5,7 +5,7 @@
 #include "chatlist.hpp"
 #include "constants.hpp"
 #ifdef WITH_LIBHANDY
-    #include "channeltabswitcherhandy.hpp"
+#include "channeltabswitcherhandy.hpp"
 #endif
 
 ChatWindow::ChatWindow() {
@@ -109,7 +109,13 @@ ChatWindow::ChatWindow() {
     m_main->add(*m_meta);
     m_main->add(m_progress);
 
-    m_progress.show();
+    m_progress.signal_start().connect([this]() {
+        m_progress.show();
+    });
+
+    m_progress.signal_stop().connect([this]() {
+        m_progress.hide();
+    });
 
     m_main->show();
 }
diff --git a/src/components/progressbar.cpp b/src/components/progressbar.cpp
index 75f86bb..65abfae 100644
--- a/src/components/progressbar.cpp
+++ b/src/components/progressbar.cpp
@@ -5,12 +5,19 @@ MessageUploadProgressBar::MessageUploadProgressBar() {
     auto &discord = Abaddon::Get().GetDiscordClient();
     discord.signal_message_progress().connect([this](const std::string &nonce, float percent) {
         if (nonce == m_last_nonce) {
+            if (!m_active) {
+                m_active = true;
+                m_signal_start.emit();
+            }
             set_fraction(percent);
         }
     });
     discord.signal_message_send_fail().connect([this](const std::string &nonce, float) {
-        if (nonce == m_last_nonce)
+        if (nonce == m_last_nonce) {
             set_fraction(0.0);
+            m_active = false;
+            m_signal_stop.emit();
+        }
     });
     discord.signal_message_create().connect([this](const Message &msg) {
         if (msg.IsPending) {
@@ -18,6 +25,16 @@ MessageUploadProgressBar::MessageUploadProgressBar() {
         } else if (msg.Nonce.has_value() && (*msg.Nonce == m_last_nonce)) {
             m_last_nonce = "";
             set_fraction(0.0);
+            m_active = false;
+            m_signal_stop.emit();
         }
     });
 }
+
+MessageUploadProgressBar::type_signal_start MessageUploadProgressBar::signal_start() {
+    return m_signal_start;
+}
+
+MessageUploadProgressBar::type_signal_stop MessageUploadProgressBar::signal_stop() {
+    return m_signal_stop;
+}
diff --git a/src/components/progressbar.hpp b/src/components/progressbar.hpp
index 483ee47..8efb87a 100644
--- a/src/components/progressbar.hpp
+++ b/src/components/progressbar.hpp
@@ -6,5 +6,16 @@ public:
     MessageUploadProgressBar();
 
 private:
+    bool m_active = false;
     std::string m_last_nonce;
+
+    using type_signal_start = sigc::signal<void()>;
+    using type_signal_stop = sigc::signal<void()>;
+
+    type_signal_start m_signal_start;
+    type_signal_stop m_signal_stop;
+
+public:
+    type_signal_start signal_start();
+    type_signal_stop signal_stop();
 };