Remove pixel value from fonts

4 files changed, 9 insertions, 15 deletions

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_);
 }