d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-29 22:28:49 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix #217: create space for checkmark beforehand

Browse source
This commit is contained in:
Chris Tarazi 2018-02-04 17:22:55 -08:00
parent 20f65aee5d
commit a15079c68f
No known key found for this signature in database
GPG key ID: 746C4A065572CA6B
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/timeline/TimelineItem.h
View file

@ -137,6 +137,7 @@ private:
QFont font_; QFont font_;
QLabel *timestamp_; QLabel *timestamp_;
QLabel *checkmark_;
QLabel *userName_; QLabel *userName_;
QLabel *body_; QLabel *body_;
}; };

15
src/timeline/TimelineItem.cc
View file

@ -61,6 +61,10 @@ TimelineItem::init()
mainLayout_->setContentsMargins(conf::timeline::headerLeftMargin, 0, 0, 0); mainLayout_->setContentsMargins(conf::timeline::headerLeftMargin, 0, 0, 0);
mainLayout_->setSpacing(0); mainLayout_->setSpacing(0);
checkmark_ = new QLabel(" ", this);
checkmark_->setStyleSheet(
QString("font-size: %1px;").arg(conf::timeline::fonts::timestamp));
} }
/* /*
@ -108,6 +112,7 @@ TimelineItem::TimelineItem(mtx::events::MessageType ty,
messageLayout_->addWidget(body_, 1); messageLayout_->addWidget(body_, 1);
} }
messageLayout_->addWidget(checkmark_);
messageLayout_->addWidget(timestamp_); messageLayout_->addWidget(timestamp_);
mainLayout_->addLayout(messageLayout_); mainLayout_->addLayout(messageLayout_);
} }
@ -239,6 +244,7 @@ TimelineItem::TimelineItem(const mtx::events::RoomEvent<mtx::events::msg::Notice
messageLayout_->addWidget(body_, 1); messageLayout_->addWidget(body_, 1);
} }
messageLayout_->addWidget(checkmark_);
messageLayout_->addWidget(timestamp_); messageLayout_->addWidget(timestamp_);
mainLayout_->addLayout(messageLayout_); mainLayout_->addLayout(messageLayout_);
} }
@ -285,6 +291,7 @@ TimelineItem::TimelineItem(const mtx::events::RoomEvent<mtx::events::msg::Emote>
messageLayout_->addWidget(body_, 1); messageLayout_->addWidget(body_, 1);
} }
messageLayout_->addWidget(checkmark_);
messageLayout_->addWidget(timestamp_); messageLayout_->addWidget(timestamp_);
mainLayout_->addLayout(messageLayout_); mainLayout_->addLayout(messageLayout_);
} }
@ -336,6 +343,7 @@ TimelineItem::TimelineItem(const mtx::events::RoomEvent<mtx::events::msg::Text>
messageLayout_->addWidget(body_, 1); messageLayout_->addWidget(body_, 1);
} }
messageLayout_->addWidget(checkmark_);
messageLayout_->addWidget(timestamp_); messageLayout_->addWidget(timestamp_);
mainLayout_->addLayout(messageLayout_); mainLayout_->addLayout(messageLayout_);
} }
@ -343,11 +351,8 @@ TimelineItem::TimelineItem(const mtx::events::RoomEvent<mtx::events::msg::Text>
void void
TimelineItem::markReceived() TimelineItem::markReceived()
{ {
auto checkmark = new QLabel("✓", this); checkmark_->setText("✓");
checkmark->setStyleSheet(QString("font-size: %1px;").arg(conf::timeline::fonts::timestamp)); checkmark_->setAlignment(Qt::AlignTop);
checkmark->setAlignment(Qt::AlignTop);
messageLayout_->insertWidget(1, checkmark);
} }
// Only the body is displayed. // Only the body is displayed.