Merge branch 'master' into tabs

This commit is contained in:
ouwou
2022-04-17 02:20:34 -04:00
4 changed files with 14 additions and 7 deletions

View File

@@ -148,6 +148,11 @@ void MainWindow::UpdateChatReactionRemove(Snowflake id, const Glib::ustring &par
m_chat.UpdateReactions(id);
}
void MainWindow::UpdateMenus() {
OnDiscordSubmenuPopup();
OnViewSubmenuPopup();
}
void MainWindow::OnDiscordSubmenuPopup() {
auto &discord = Abaddon::Get().GetDiscordClient();
auto channel_id = GetChatActiveChannel();
@@ -243,12 +248,6 @@ void MainWindow::SetupMenu() {
m_menu_bar.append(m_menu_view);
m_menu_bar.show_all();
m_menu_bar.signal_event().connect([this](GdkEvent *ev) -> bool {
OnViewSubmenuPopup();
OnDiscordSubmenuPopup();
return false;
});
m_menu_discord_connect.signal_activate().connect([this] {
m_signal_action_connect.emit();
});

View File

@@ -23,6 +23,7 @@ public:
Snowflake GetChatOldestListedMessage();
void UpdateChatReactionAdd(Snowflake id, const Glib::ustring &param);
void UpdateChatReactionRemove(Snowflake id, const Glib::ustring &param);
void UpdateMenus();
ChannelList *GetChannelList();
ChatWindow *GetChatWindow();