chatterino2
Code Issues

Renamed variables to clear some warnings.

Browse Source
This commit is contained in:
23rd
2019-05-08 09:51:14 +03:00
committed by pajlada
parent efec76df5b
commit 9654650bee
19 changed files with 73 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/messages/layouts/MessageLayout.cpp
+3 -3
View File
@@ -99,14 +99,14 @@ bool MessageLayout::layout(int width, float scale, MessageElementFlags flags)
return true;
}
void MessageLayout::actuallyLayout(int width, MessageElementFlags _flags)
void MessageLayout::actuallyLayout(int width, MessageElementFlags flags)
{
this->layoutCount_++;
auto messageFlags = this->message_->flags;
if (this->flags.has(MessageLayoutFlag::Expanded) ||
(_flags.has(MessageElementFlag::ModeratorTools) &&
(flags.has(MessageElementFlag::ModeratorTools) &&
!this->message_->flags.has(MessageFlag::Disabled))) //
{
messageFlags.unset(MessageFlag::Collapsed);
@@ -121,7 +121,7 @@ void MessageLayout::actuallyLayout(int width, MessageElementFlags _flags)
{
continue;
}
element->addToContainer(*this->container_, _flags);
element->addToContainer(*this->container_, flags);
}
if (this->height_ != this->container_->getHeight())
src/messages/layouts/MessageLayoutContainer.cpp
+4 -4
View File
@@ -390,17 +390,17 @@ void MessageLayoutContainer::paintSelection(QPainter &painter, int messageIndex,
int lineIndex2 = lineIndex + 1;
for (; lineIndex2 < this->lines_.size(); lineIndex2++)
{
Line &line = this->lines_[lineIndex2];
QRect rect = line.rect;
Line &line2 = this->lines_[lineIndex2];
QRect rect = line2.rect;
rect.setTop(std::max(0, rect.top()) + yOffset);
rect.setBottom(
std::min(this->height_, rect.bottom()) +
yOffset);
rect.setLeft(this->elements_[line.startIndex]
rect.setLeft(this->elements_[line2.startIndex]
->getRect()
.left());
rect.setRight(this->elements_[line.endIndex - 1]
rect.setRight(this->elements_[line2.endIndex - 1]
->getRect()
.right());