diff options
| -rw-r--r-- | .github/workflows/ci.yml | 2 | ||||
| -rw-r--r-- | src/abaddon.cpp | 14 | ||||
| -rw-r--r-- | src/components/chatlist.cpp | 1 | ||||
| -rw-r--r-- | src/components/chatmessage.cpp | 11 | ||||
| m--------- | subprojects/keychain | 0 |
5 files changed, 10 insertions, 18 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index def7b82..984d7f7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -68,7 +68,7 @@ jobs: cd build cp *.exe artifactdir/bin cd .. - cp /mingw64/ssl/certs/ca-bundle.crt build/artifactdir/ssl/certs + cp /mingw64/etc/ssl/certs/ca-bundle.crt build/artifactdir/ssl/certs cp -r /mingw64/lib/gdk-pixbuf-2.0 build/artifactdir/lib cp -r res/css res/res res/fonts build/artifactdir/bin cp /mingw64/share/glib-2.0/schemas/gschemas.compiled build/artifactdir/share/glib-2.0/schemas diff --git a/src/abaddon.cpp b/src/abaddon.cpp index d759426..0f4658a 100644 --- a/src/abaddon.cpp +++ b/src/abaddon.cpp @@ -725,19 +725,7 @@ void Abaddon::ActionChannelOpened(Snowflake id, bool expand_to) { const bool can_access = channel->IsDM() || m_discord.HasChannelPermission(m_discord.GetUserData().ID, id, Permission::VIEW_CHANNEL); - if (channel->Type == ChannelType::GUILD_TEXT || channel->Type == ChannelType::GUILD_NEWS) - m_main_window->set_title(std::string(APP_TITLE) + " - #" + *channel->Name); - else { - std::string display; - const auto recipients = channel->GetDMRecipients(); - if (recipients.size() > 1) - display = std::to_string(recipients.size()) + " users"; - else if (recipients.size() == 1) - display = recipients[0].Username; - else - display = "Empty group"; - m_main_window->set_title(std::string(APP_TITLE) + " - " + display); - } + m_main_window->set_title(std::string(APP_TITLE) + " - " + channel->GetDisplayName()); m_main_window->UpdateChatActiveChannel(id, expand_to); if (m_channels_requested.find(id) == m_channels_requested.end()) { // dont fire requests we know will fail diff --git a/src/components/chatlist.cpp b/src/components/chatlist.cpp index d2995ee..9becbdb 100644 --- a/src/components/chatlist.cpp +++ b/src/components/chatlist.cpp @@ -6,7 +6,6 @@ ChatList::ChatList() { m_list.get_style_context()->add_class("messages"); - set_can_focus(false); set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_ALWAYS); get_vadjustment()->signal_value_changed().connect(sigc::mem_fun(*this, &ChatList::OnVAdjustmentValueChanged)); diff --git a/src/components/chatmessage.cpp b/src/components/chatmessage.cpp index 3afdf9f..20e88ea 100644 --- a/src/components/chatmessage.cpp +++ b/src/components/chatmessage.cpp @@ -166,7 +166,8 @@ Gtk::TextView *ChatMessageItemContainer::CreateTextComponent(const Message &data if (data.IsPending) tv->get_style_context()->add_class("pending"); tv->get_style_context()->add_class("message-text"); - tv->set_can_focus(false); + tv->set_can_focus(true); + tv->set_cursor_visible(false); tv->set_editable(false); tv->set_wrap_mode(Gtk::WRAP_WORD_CHAR); tv->set_halign(Gtk::ALIGN_FILL); @@ -335,6 +336,7 @@ Gtk::Widget *ChatMessageItemContainer::CreateEmbedComponent(const EmbedData &emb author_lbl->set_hexpand(false); author_lbl->set_text(*embed.Author->Name); author_lbl->get_style_context()->add_class("embed-author"); + author_lbl->set_selectable(true); author_box->add(*author_lbl); } } @@ -351,6 +353,7 @@ Gtk::Widget *ChatMessageItemContainer::CreateEmbedComponent(const EmbedData &emb title_label->set_line_wrap(true); title_label->set_line_wrap_mode(Pango::WRAP_WORD_CHAR); title_label->set_max_width_chars(50); + title_label->set_selectable(true); title_ev->add(*title_label); content->pack_start(*title_ev); @@ -380,6 +383,7 @@ Gtk::Widget *ChatMessageItemContainer::CreateEmbedComponent(const EmbedData &emb desc_label->set_halign(Gtk::ALIGN_START); desc_label->set_hexpand(false); desc_label->get_style_context()->add_class("embed-description"); + desc_label->set_selectable(true); content->pack_start(*desc_label); } } @@ -422,6 +426,8 @@ Gtk::Widget *ChatMessageItemContainer::CreateEmbedComponent(const EmbedData &emb field_box->pack_start(*field_val); field_lbl->get_style_context()->add_class("embed-field-title"); field_val->get_style_context()->add_class("embed-field-value"); + field_lbl->set_selectable(true); + field_val->set_selectable(true); flow->insert(*field_box, -1); } } @@ -445,6 +451,7 @@ Gtk::Widget *ChatMessageItemContainer::CreateEmbedComponent(const EmbedData &emb footer_lbl->set_hexpand(false); footer_lbl->set_text(embed.Footer->Text); footer_lbl->get_style_context()->add_class("embed-footer"); + footer_lbl->set_selectable(true); content->pack_start(*footer_lbl); } @@ -1170,8 +1177,6 @@ ChatMessageHeader::ChatMessageHeader(const Message &data) m_meta_box.set_hexpand(true); m_meta_box.set_can_focus(false); - m_content_box.set_can_focus(false); - const auto on_enter_cb = [this](const GdkEventCrossing *event) -> bool { if (m_anim_avatar) m_avatar.property_pixbuf_animation() = m_anim_avatar; diff --git a/subprojects/keychain b/subprojects/keychain -Subproject 44b517d0962c83cce31c190a6be44c3ddbf52d5 +Subproject 502312f59fdc44fa1103e67f8f17cec3affb82d |