diff options
Diffstat (limited to 'windows')
| -rw-r--r-- | windows/mainwindow.cpp | 7 | ||||
| -rw-r--r-- | windows/pinnedwindow.cpp | 5 |
2 files changed, 7 insertions, 5 deletions
diff --git a/windows/mainwindow.cpp b/windows/mainwindow.cpp index 7ddaaf2..0bfff7c 100644 --- a/windows/mainwindow.cpp +++ b/windows/mainwindow.cpp @@ -244,16 +244,15 @@ void MainWindow::OnDiscordSubmenuPopup(const Gdk::Rectangle *flipped_rect, const m_menu_discord_set_status.set_sensitive(discord_active); } -void MainWindow::OnViewSubmenuPopup(const Gdk::Rectangle *flipped_rect, const Gdk::Rectangle *final_rect, bool flipped_x, bool flipped_y) { +void MainWindow::OnViewSubmenuPopup(const Gdk::Rectangle* flipped_rect, const Gdk::Rectangle* final_rect, bool flipped_x, bool flipped_y) { m_menu_view_friends.set_sensitive(Abaddon::Get().GetDiscordClient().IsStarted()); auto channel_id = GetChatActiveChannel(); auto channel = Abaddon::Get().GetDiscordClient().GetChannel(channel_id); m_menu_view_pins.set_sensitive(false); m_menu_view_threads.set_sensitive(false); if (channel.has_value()) { - const bool b = channel->Type == ChannelType::GUILD_TEXT; - m_menu_view_pins.set_sensitive(b); - m_menu_view_threads.set_sensitive(b); + m_menu_view_threads.set_sensitive(channel->Type == ChannelType::GUILD_TEXT); + m_menu_view_pins.set_sensitive(channel->Type == ChannelType::GUILD_TEXT || channel->Type == ChannelType::DM || channel->Type == ChannelType::GROUP_DM); } } diff --git a/windows/pinnedwindow.cpp b/windows/pinnedwindow.cpp index fc6230c..2e9b6fd 100644 --- a/windows/pinnedwindow.cpp +++ b/windows/pinnedwindow.cpp @@ -8,7 +8,10 @@ PinnedWindow::PinnedWindow(const ChannelData &data) set_name("pinned-messages"); set_default_size(450, 375); - set_title("#" + *data.Name + " - Pinned Messages"); + if (data.Name.has_value()) + set_title("#" + *data.Name + " - Pinned Messages"); + else + set_title("Pinned Messages"); set_position(Gtk::WIN_POS_CENTER); get_style_context()->add_class("app-window"); get_style_context()->add_class("app-popup"); |