diff --git a/src/timeline/TimelineItem.cpp b/src/timeline/TimelineItem.cpp
index 9558c397..ec07d437 100644
--- a/src/timeline/TimelineItem.cpp
+++ b/src/timeline/TimelineItem.cpp
@@ -155,9 +155,8 @@ TimelineItem::init()
userName_ = nullptr;
body_ = nullptr;
- font_.setPixelSize(conf::fontSize);
usernameFont_ = font_;
- usernameFont_.setWeight(60);
+ usernameFont_.setWeight(QFont::Medium);
QFontMetrics fm(font_);
@@ -216,9 +215,11 @@ TimelineItem::init()
mainLayout_->setContentsMargins(conf::timeline::headerLeftMargin, 0, 0, 0);
mainLayout_->setSpacing(0);
- QFont timestampFont;
- timestampFont.setPixelSize(conf::timeline::fonts::indicator);
- QFontMetrics tsFm(timestampFont);
+ timestampFont_.setPointSizeF(timestampFont_.pointSizeF() * 0.9);
+ timestampFont_.setFamily("Monospace");
+ timestampFont_.setStyleHint(QFont::Monospace);
+
+ QFontMetrics tsFm(timestampFont_);
statusIndicator_ = new StatusIndicator(this);
statusIndicator_->setFixedWidth(tsFm.height() - tsFm.leading());
@@ -662,13 +663,8 @@ TimelineItem::generateUserName(const QString &user_id, const QString &displaynam
void
TimelineItem::generateTimestamp(const QDateTime &time)
{
- QFont timestampFont;
- timestampFont.setFamily("Monospace");
- timestampFont.setStyleHint(QFont::Monospace);
- timestampFont.setPixelSize(conf::timeline::fonts::timestamp);
-
timestamp_ = new QLabel(this);
- timestamp_->setFont(timestampFont);
+ timestamp_->setFont(timestampFont_);
timestamp_->setText(
QString("<span style=\"color: #999\"> %1 </span>").arg(time.toString("HH:mm")));
}
@@ -683,9 +679,7 @@ TimelineItem::replaceEmoji(const QString &body)
for (auto &code : utf32_string) {
// TODO: Be more precise here.
if (code > 9000)
- fmtBody += QString("<span style=\"font-family: Emoji "
- "One; font-size: %1px\">")
- .arg(conf::emojiSize) +
+ fmtBody += QString("<span style=\"font-family: Emoji One;\">") +
QString::fromUcs4(&code, 1) + "</span>";
else
fmtBody += QString::fromUcs4(&code, 1);
diff --git a/src/timeline/TimelineItem.h b/src/timeline/TimelineItem.h
index ae486257..d24909d6 100644
--- a/src/timeline/TimelineItem.h
+++ b/src/timeline/TimelineItem.h
@@ -278,6 +278,7 @@ private:
QFont font_;
QFont usernameFont_;
+ QFont timestampFont_;
StatusIndicator *statusIndicator_;
diff --git a/src/timeline/TimelineView.cpp b/src/timeline/TimelineView.cpp
index 90e116c1..07de25b6 100644
--- a/src/timeline/TimelineView.cpp
+++ b/src/timeline/TimelineView.cpp
@@ -519,7 +519,6 @@ TimelineView::init()
// Height of the typing display.
QFont f;
- f.setPixelSize(conf::typingNotificationFontSize);
const int bottomMargin = QFontMetrics(f).height() + 6;
scroll_layout_ = new QVBoxLayout(scroll_widget_);
diff --git a/src/timeline/widgets/AudioItem.cpp b/src/timeline/widgets/AudioItem.cpp
index 0c4bf9e4..72332174 100644
--- a/src/timeline/widgets/AudioItem.cpp
+++ b/src/timeline/widgets/AudioItem.cpp
@@ -159,8 +159,7 @@ void
AudioItem::resizeEvent(QResizeEvent *event)
{
QFont font;
- font.setPixelSize(12);
- font.setWeight(80);
+ font.setWeight(QFont::Medium);
QFontMetrics fm(font);
const int computedWidth = std::min(
@@ -180,8 +179,7 @@ AudioItem::paintEvent(QPaintEvent *event)
painter.setRenderHint(QPainter::Antialiasing);
QFont font;
- font.setPixelSize(12);
- font.setWeight(80);
+ font.setWeight(QFont::Medium);
QFontMetrics fm(font);
@@ -225,7 +223,7 @@ AudioItem::paintEvent(QPaintEvent *event)
painter.drawText(QPoint(textStartX, textStartY), elidedText);
// Draw the filesize.
- font.setWeight(50);
+ font.setWeight(QFont::Normal);
painter.setFont(font);
painter.setPen(QPen(textColor_));
painter.drawText(QPoint(textStartX, textStartY + 1.5 * fm.ascent()), readableFileSize_);
diff --git a/src/timeline/widgets/FileItem.cpp b/src/timeline/widgets/FileItem.cpp
index 850941ae..e97554e2 100644
--- a/src/timeline/widgets/FileItem.cpp
+++ b/src/timeline/widgets/FileItem.cpp
@@ -150,8 +150,7 @@ void
FileItem::resizeEvent(QResizeEvent *event)
{
QFont font;
- font.setPixelSize(12);
- font.setWeight(80);
+ font.setWeight(QFont::Medium);
QFontMetrics fm(font);
const int computedWidth = std::min(
@@ -171,8 +170,7 @@ FileItem::paintEvent(QPaintEvent *event)
painter.setRenderHint(QPainter::Antialiasing);
QFont font;
- font.setPixelSize(12);
- font.setWeight(80);
+ font.setWeight(QFont::Medium);
QFontMetrics fm(font);
@@ -210,7 +208,7 @@ FileItem::paintEvent(QPaintEvent *event)
painter.drawText(QPoint(textStartX, textStartY), elidedText);
// Draw the filesize.
- font.setWeight(50);
+ font.setWeight(QFont::Normal);
painter.setFont(font);
painter.setPen(QPen(textColor_));
painter.drawText(QPoint(textStartX, textStartY + 1.5 * fm.ascent()), readableFileSize_);
diff --git a/src/timeline/widgets/ImageItem.cpp b/src/timeline/widgets/ImageItem.cpp
index 4c68d683..f06b9a5b 100644
--- a/src/timeline/widgets/ImageItem.cpp
+++ b/src/timeline/widgets/ImageItem.cpp
@@ -183,8 +183,7 @@ ImageItem::paintEvent(QPaintEvent *event)
QPainter painter(this);
painter.setRenderHint(QPainter::Antialiasing);
- QFont font("Open Sans");
- font.setPixelSize(conf::fontSize);
+ QFont font;
QFontMetrics metrics(font);
const int fontHeight = metrics.height() + metrics.ascent();
@@ -223,9 +222,9 @@ ImageItem::paintEvent(QPaintEvent *event)
QString elidedText = metrics.elidedText(text_, Qt::ElideRight, width_ - 10);
- font.setWeight(80);
+ font.setWeight(QFont::Medium);
painter.setFont(font);
- painter.setPen(QPen(QColor("white")));
+ painter.setPen(QPen(QColor(Qt::white)));
textRegion_.adjust(5, 0, 5, 0);
painter.drawText(textRegion_, Qt::AlignVCenter, elidedText);
diff --git a/src/timeline/widgets/VideoItem.cpp b/src/timeline/widgets/VideoItem.cpp
index daf181b2..4b5dc022 100644
--- a/src/timeline/widgets/VideoItem.cpp
+++ b/src/timeline/widgets/VideoItem.cpp
@@ -50,7 +50,6 @@ VideoItem::VideoItem(const mtx::events::RoomEvent<mtx::events::msg::Video> &even
label_->setMargin(0);
label_->setTextInteractionFlags(Qt::TextSelectableByMouse | Qt::TextBrowserInteraction);
label_->setOpenExternalLinks(true);
- label_->setStyleSheet(QString("font-size: %1px;").arg(conf::fontSize));
layout->addWidget(label_);
}
|
