add mention overlay to folders in classic

1 files changed, 17 insertions, 2 deletions

diff --git a/src/components/channellist/classic/guildlist.cpp b/src/components/channellist/classic/guildlist.cpp
index 6bee484..fdc15f9 100644
--- a/src/components/channellist/classic/guildlist.cpp
+++ b/src/components/channellist/classic/guildlist.cpp
@@ -103,7 +103,22 @@ static Gtk::Widget *AddMentionOverlay(Gtk::Widget *widget, Snowflake guild_id) {
     mention_overlay->signal_realize().connect([mention_overlay]() {
         mention_overlay->get_window()->set_pass_through(true);
     });
-    overlay->show_all();
+    mention_overlay->show();
+    overlay->show();
+    return overlay;
+}
+
+static Gtk::Widget *AddMentionOverlay(Gtk::Widget *widget, const UserSettingsGuildFoldersEntry &folder) {
+    auto *overlay = Gtk::make_managed<Gtk::Overlay>();
+    overlay->add(*widget);
+    auto *mention_overlay = Gtk::make_managed<MentionOverlay>(folder);
+    overlay->add_overlay(*mention_overlay);
+    overlay->set_overlay_pass_through(*mention_overlay, true);
+    mention_overlay->signal_realize().connect([mention_overlay]() {
+        mention_overlay->get_window()->set_pass_through(true);
+    });
+    mention_overlay->show();
+    overlay->show();
     return overlay;
 }
 
@@ -151,7 +166,7 @@ void GuildList::AddFolder(const UserSettingsGuildFoldersEntry &folder) {
     }
 
     folder_widget->show();
-    add(*folder_widget);
+    add(*AddMentionOverlay(folder_widget, folder));
 }
 
 void GuildList::Clear() {