Minki/abaddon-ppc
1
0
Fork 0
forked from OpenGamers/abaddon
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bring back user joined/message pinned

Browse Source
This commit is contained in:
ouwou
2020-09-26 00:49:25 -04:00
parent 3689f5ae9f
commit 1460d89140
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
components/chatmessage.cpp
View File

@@ -29,7 +29,7 @@ ChatMessageItemContainer *ChatMessageItemContainer::FromMessage(Snowflake id) {
container->ID = data->ID; container->ID = data->ID;
container->ChannelID = data->ChannelID; container->ChannelID = data->ChannelID;
if (data->Content.size() > 0) { if (data->Content.size() > 0 || data->Type != MessageType::DEFAULT) {
container->m_text_component = CreateTextComponent(data); container->m_text_component = CreateTextComponent(data);
container->AttachMenuHandler(container->m_text_component); container->AttachMenuHandler(container->m_text_component);
container->m_main->add(*container->m_text_component); container->m_main->add(*container->m_text_component);
@@ -95,7 +95,22 @@ Gtk::TextView *ChatMessageItemContainer::CreateTextComponent(const Message *data
tv->set_wrap_mode(Gtk::WRAP_WORD_CHAR); tv->set_wrap_mode(Gtk::WRAP_WORD_CHAR);
tv->set_halign(Gtk::ALIGN_FILL); tv->set_halign(Gtk::ALIGN_FILL);
tv->set_hexpand(true); tv->set_hexpand(true);
tv->get_buffer()->set_text(data->Content);
auto b = tv->get_buffer();
Gtk::TextBuffer::iterator s, e; // lame
b->get_bounds(s, e);
switch (data->Type) {
case MessageType::DEFAULT:
b->set_text(data->Content);
break;
case MessageType::GUILD_MEMBER_JOIN:
b->insert_markup(s, "<span color='#999999'><i>[user joined]</i></span>");
break;
case MessageType::CHANNEL_PINNED_MESSAGE:
b->insert_markup(s, "<span color='#999999'><i>[message pinned]</i></span>");
break;
default: break;
}
return tv; return tv;
} }