chatterino2
Code Issues

added a setting to collapse long messages by default

Browse Source
This commit is contained in:
fourtf
2018-05-24 11:35:50 +02:00
parent 2ac9b4d0e7
commit 4de2a6b65f
8 changed files with 91 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/messages/layouts/messagelayout.cpp
+17 -3
View File
@@ -107,12 +107,20 @@ bool MessageLayout::layout(int width, float scale, MessageElement::Flags flags)
return true;
}
void MessageLayout::actuallyLayout(int width, MessageElement::Flags flags)
void MessageLayout::actuallyLayout(int width, MessageElement::Flags _flags)
{
this->container.begin(width, this->scale, this->message->flags.value);
auto messageFlags = this->message->flags.value;
if (this->flags & MessageLayout::Expanded ||
(_flags & MessageElement::ModeratorTools &&
!(this->message->flags & Message::MessageFlags::Disabled))) {
messageFlags = (Message::MessageFlags)(messageFlags & ~Message::MessageFlags::Collapsed);
}
this->container.begin(width, this->scale, messageFlags);
for (const std::unique_ptr<MessageElement> &element : this->message->getElements()) {
element->addToContainer(this->container, flags);
element->addToContainer(this->container, _flags);
}
if (this->height != this->container.getHeight()) {
@@ -121,6 +129,12 @@ void MessageLayout::actuallyLayout(int width, MessageElement::Flags flags)
this->container.end();
this->height = this->container.getHeight();
// collapsed state
this->flags &= ~Flags::Collapsed;
if (this->container.isCollapsed()) {
this->flags |= Flags::Collapsed;
}
}
// Painting