chatterino2
Code Issues

simplified message.cpp

Browse Source
This commit is contained in:
fourtf
2018-01-28 03:29:42 +01:00
parent fc758846f6
commit 591ab4d8da
20 changed files with 123 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/widgets/emotepopup.cpp
+6 -6
View File
@@ -48,13 +48,13 @@ void EmotePopup::loadChannel(SharedChannel _channel)
builder1.appendElement(new TextElement(title, MessageElement::Text));
builder1.getMessage()->addFlags(Message::Centered);
builder1.getMessage()->flags &= Message::Centered;
emoteChannel->addMessage(builder1.getMessage());
// EMOTES
messages::MessageBuilder builder2;
builder2.getMessage()->addFlags(Message::Centered);
builder2.getMessage()->addFlags(Message::DisableCompactEmotes);
builder2.getMessage()->flags &= Message::Centered;
builder2.getMessage()->flags &= Message::DisableCompactEmotes;
map.each([&](const QString &key, const util::EmoteData &value) {
builder2.appendElement((new EmoteElement(value, MessageElement::Flags::AlwaysShow)) //
@@ -87,13 +87,13 @@ void EmotePopup::loadEmojis()
messages::MessageBuilder builder1;
builder1.appendElement(new TextElement("emojis", MessageElement::Text));
builder1.getMessage()->addFlags(Message::Centered);
builder1.getMessage()->flags &= Message::Centered;
emojiChannel->addMessage(builder1.getMessage());
// emojis
messages::MessageBuilder builder;
builder.getMessage()->addFlags(Message::Centered);
builder.getMessage()->addFlags(Message::DisableCompactEmotes);
builder.getMessage()->flags &= Message::Centered;
builder.getMessage()->flags &= Message::DisableCompactEmotes;
emojis.each([this, &builder](const QString &key, const util::EmoteData &value) {
builder.appendElement((new EmoteElement(value, MessageElement::Flags::AlwaysShow)) //
src/widgets/helper/channelview.cpp
+1 -1
View File
@@ -314,7 +314,7 @@ void ChannelView::setChannel(SharedChannel newChannel)
}
}
if (!message->hasFlags(Message::DoNotTriggerNotification)) {
if (message->flags & ~Message::DoNotTriggerNotification) {
this->highlightedMessageReceived.invoke();
}
src/widgets/helper/searchpopup.cpp
+2 -2
View File
@@ -75,8 +75,8 @@ void SearchPopup::performSearch()
for (size_t i = 0; i < this->snapshot.getLength(); i++) {
messages::MessagePtr message = this->snapshot[i];
if (text.isEmpty() || message->getSearchText().indexOf(this->searchInput->text(), 0,
Qt::CaseInsensitive) != -1) {
if (text.isEmpty() ||
message->searchText.indexOf(this->searchInput->text(), 0, Qt::CaseInsensitive) != -1) {
channel->addMessage(message);
}
}