chatterino2
Code Issues

Improve Appearance of Reply Curve (#4077)

Browse Source
This commit is contained in:
Daniel Sage
2022-11-02 04:19:44 -04:00
committed by GitHub
parent 495f3ed4a9
commit 7640677a43
7 changed files with 44 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/messages/layouts/MessageLayoutContainer.cpp
+3 -14
View File
@@ -133,21 +133,20 @@ void MessageLayoutContainer::_addElement(MessageLayoutElement *element,
this->currentY_ = int(this->margin.top * this->scale_);
}
int newLineHeight = element->getRect().height();
int elementLineHeight = element->getRect().height();
// compact emote offset
bool isCompactEmote =
getSettings()->compactEmotes &&
!this->flags_.has(MessageFlag::DisableCompactEmotes) &&
element->getCreator().getFlags().has(MessageElementFlag::EmoteImages);
if (isCompactEmote)
{
newLineHeight -= COMPACT_EMOTES_OFFSET * this->scale_;
elementLineHeight -= COMPACT_EMOTES_OFFSET * this->scale_;
}
// update line height
this->lineHeight_ = std::max(this->lineHeight_, newLineHeight);
this->lineHeight_ = std::max(this->lineHeight_, elementLineHeight);
auto xOffset = 0;
bool isZeroWidthEmote = element->getCreator().getFlags().has(
@@ -218,7 +217,6 @@ void MessageLayoutContainer::breakLine()
MessageLayoutElement *element = this->elements_.at(i).get();
bool isCompactEmote =
getSettings()->compactEmotes &&
!this->flags_.has(MessageFlag::DisableCompactEmotes) &&
element->getCreator().getFlags().has(
MessageElementFlag::EmoteImages);
@@ -229,15 +227,6 @@ void MessageLayoutContainer::breakLine()
yExtra = (COMPACT_EMOTES_OFFSET / 2) * this->scale_;
}
// if (element->getCreator().getFlags() &
// MessageElementFlag::Badges)
// {
if (element->getRect().height() < this->textLineHeight_)
{
// yExtra -= (this->textLineHeight_ - element->getRect().height()) /
// 2;
}
element->setPosition(
QPoint(element->getRect().x() + xOffset +
int(this->margin.left * this->scale_),