mirror of
https://github.com/celisej567/abaddon.git
synced 2026-09-13 20:18:50 +03:00
Merge branch 'master' into tabs
This commit is contained in:
@@ -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();
|
||||
});
|
||||
|
||||
@@ -23,6 +23,7 @@ public:
|
||||
Snowflake GetChatOldestListedMessage();
|
||||
void UpdateChatReactionAdd(Snowflake id, const Glib::ustring ¶m);
|
||||
void UpdateChatReactionRemove(Snowflake id, const Glib::ustring ¶m);
|
||||
void UpdateMenus();
|
||||
|
||||
ChannelList *GetChannelList();
|
||||
ChatWindow *GetChatWindow();
|
||||
|
||||
Reference in New Issue
Block a user