fixed gifs on the emotepicker

src/channelmanager.cpp

@@ -131,4 +131,9 @@ EmoteManager &ChannelManager::getEmoteManager()
     return this->emoteManager;
 }
 
+WindowManager &ChannelManager::getWindowManager()
+{
+    return this->windowManager;
+}
+
 }  // namespace chatterino

src/channelmanager.hpp

@@ -30,6 +30,7 @@ public:
 
     const std::string &getUserID(const std::string &username);
     EmoteManager &getEmoteManager();
+    WindowManager &getWindowManager();
 
     // Special channels
     const std::shared_ptr<twitch::TwitchChannel> whispersChannel;

src/widgets/channelview.cpp

@@ -8,6 +8,7 @@
 #include "ui_accountpopupform.h"
 #include "util/distancebetweenpoints.hpp"
 #include "widgets/chatwidget.hpp"
+#include "windowmanager.hpp"
 
 #include <QDebug>
 #include <QDesktopServices>
@@ -25,8 +26,9 @@ using namespace chatterino::messages;
 namespace chatterino {
 namespace widgets {
 
-ChannelView::ChannelView(BaseWidget *parent)
+ChannelView::ChannelView(WindowManager &windowManager, BaseWidget *parent)
     : BaseWidget(parent)
+    , windowManager(windowManager)
     , scrollBar(this)
     , userPopupWidget(std::shared_ptr<Channel>())
 {
@@ -44,6 +46,9 @@ ChannelView::ChannelView(BaseWidget *parent)
 
         this->layoutMessages();
     });
+
+    this->repaintGifsConnection =
+        windowManager.repaintGifs.connect([&] { this->updateGifEmotes(); });
 }
 
 ChannelView::~ChannelView()

src/widgets/channelview.hpp

@@ -83,7 +83,7 @@ class ChannelView : public BaseWidget
     Q_OBJECT
 
 public:
-    explicit ChannelView(BaseWidget *parent = 0);
+    explicit ChannelView(WindowManager &windowManager, BaseWidget *parent = 0);
     ~ChannelView();
 
     void updateGifEmotes();
@@ -117,6 +117,8 @@ private:
         QRect rect;
     };
 
+    WindowManager &windowManager;
+
     void detachChannel();
 
     void drawMessages(QPainter &painter);
@@ -149,6 +151,7 @@ private:
 
     boost::signals2::connection messageAppendedConnection;
     boost::signals2::connection messageRemovedConnection;
+    boost::signals2::connection repaintGifsConnection;
 
 private slots:
     void wordTypeMaskChanged()

src/widgets/chatwidget.cpp

@@ -52,8 +52,8 @@ ChatWidget::ChatWidget(ChannelManager &_channelManager, NotebookPage *parent)
     , channel(_channelManager.emptyChannel)
     , vbox(this)
     , header(this)
-    , view(this)
+    , view(_channelManager.getWindowManager(), this)
-    , input(this, _channelManager.getEmoteManager())
+    , input(this, _channelManager.getEmoteManager(), _channelManager.getWindowManager())
 {
     this->vbox.setSpacing(0);
     this->vbox.setMargin(1);
@@ -87,7 +87,7 @@ ChatWidget::ChatWidget(ChannelManager &_channelManager, NotebookPage *parent)
 
 ChatWidget::~ChatWidget()
 {
-    channelNameUpdated("");
+    this->channelNameUpdated("");
 }
 
 std::shared_ptr<Channel> ChatWidget::getChannel() const

src/widgets/chatwidgetinput.cpp

@@ -13,10 +13,12 @@
 namespace chatterino {
 namespace widgets {
 
-ChatWidgetInput::ChatWidgetInput(ChatWidget *_chatWidget, EmoteManager &emoteManager)
+ChatWidgetInput::ChatWidgetInput(ChatWidget *_chatWidget, EmoteManager &emoteManager,
+                                 WindowManager &windowManager)
     : BaseWidget(_chatWidget)
     , chatWidget(_chatWidget)
     , emoteManager(emoteManager)
+    , windowManager(windowManager)
     , emotesLabel(this)
 {
     this->setMaximumHeight(150);
@@ -47,7 +49,8 @@ ChatWidgetInput::ChatWidgetInput(ChatWidget *_chatWidget, EmoteManager &emoteMan
 
     connect(&this->emotesLabel, &RippleEffectLabel::clicked, [this] {
         if (this->emotePopup == nullptr) {
-            this->emotePopup = new EmotePopup(this->colorScheme, this->emoteManager);
+            this->emotePopup =
+                new EmotePopup(this->colorScheme, this->emoteManager, this->windowManager);
         }
 
         this->emotePopup->resize(300, 500);

src/widgets/chatwidgetinput.hpp

@@ -26,7 +26,7 @@ class ChatWidgetInput : public BaseWidget
     Q_OBJECT
 
 public:
-    ChatWidgetInput(ChatWidget *_chatWidget, EmoteManager &);
+    ChatWidgetInput(ChatWidget *_chatWidget, EmoteManager &, WindowManager &);
     ~ChatWidgetInput();
 
 protected:
@@ -39,6 +39,7 @@ private:
     ChatWidget *const chatWidget;
     EmotePopup *emotePopup = nullptr;
     EmoteManager &emoteManager;
+    WindowManager &windowManager;
 
     boost::signals2::connection textLengthVisibleChangedConnection;
     QHBoxLayout hbox;

src/widgets/emotepopup.cpp

@@ -11,7 +11,8 @@ using namespace chatterino::messages;
 namespace chatterino {
 namespace widgets {
 
-EmotePopup::EmotePopup(ColorScheme &colorScheme, EmoteManager &emoteManager)
+EmotePopup::EmotePopup(ColorScheme &colorScheme, EmoteManager &emoteManager,
+                       WindowManager &windowManager)
     : BaseWidget(colorScheme, 0)
     , emoteManager(emoteManager)
 {
@@ -19,7 +20,7 @@ EmotePopup::EmotePopup(ColorScheme &colorScheme, EmoteManager &emoteManager)
     this->setLayout(layout);
     layout->setMargin(0);
 
-    view = new ChannelView(this);
+    view = new ChannelView(windowManager, this);
     layout->addWidget(view);
 }
 

src/widgets/emotepopup.hpp

@@ -11,7 +11,7 @@ namespace widgets {
 class EmotePopup : public BaseWidget
 {
 public:
-    explicit EmotePopup(ColorScheme &, EmoteManager &);
+    explicit EmotePopup(ColorScheme &, EmoteManager &, WindowManager &);
 
     void loadChannel(std::shared_ptr<Channel> channel);
 

src/widgets/mainwindow.cpp

@@ -108,23 +108,6 @@ void MainWindow::repaintVisibleChatWidgets(Channel *channel)
     }
 }
 
-void MainWindow::repaintGifEmotes()
-{
-    auto *page = this->notebook.getSelectedPage();
-
-    if (page == nullptr) {
-        return;
-    }
-
-    const std::vector<ChatWidget *> &widgets = page->getChatWidgets();
-
-    for (auto it = widgets.begin(); it != widgets.end(); ++it) {
-        ChatWidget *widget = *it;
-
-        widget->updateGifEmotes();
-    }
-}
-
 void MainWindow::load(const boost::property_tree::ptree &tree)
 {
     this->notebook.load(tree);

src/widgets/mainwindow.hpp

@@ -32,7 +32,6 @@ public:
 
     void layoutVisibleChatWidgets(Channel *channel = nullptr);
     void repaintVisibleChatWidgets(Channel *channel = nullptr);
-    void repaintGifEmotes();
 
     void load(const boost::property_tree::ptree &tree);
     boost::property_tree::ptree save();

src/windowmanager.cpp

@@ -41,9 +41,7 @@ void WindowManager::repaintVisibleChatWidgets(Channel *channel)
 
 void WindowManager::repaintGifEmotes()
 {
-    if (this->mainWindow != nullptr) {
+    this->repaintGifs();
-        this->mainWindow->repaintGifEmotes();
-    }
 }
 
 // void WindowManager::updateAll()

src/windowmanager.hpp

@@ -30,6 +30,8 @@ public:
     void load();
     void save();
 
+    boost::signals2::signal<void()> repaintGifs;
+
 private:
     std::mutex windowMutex;