summary refs log tree commit diff
path: root/src/timeline/widgets
diff options
context:
space:
mode:
authorJoseph Donofry <joedonofry@gmail.com>2019-07-04 21:20:19 -0400
committerJoseph Donofry <joedonofry@gmail.com>2019-07-04 21:20:19 -0400
commitc0a010acbb7f0045aa1ce33f82b0d537a715a886 (patch)
treeb3c28203235e32e8e4551fc9948f3b42fbaa3ae1 /src/timeline/widgets
parentFix some linting issues (diff)
downloadnheko-c0a010acbb7f0045aa1ce33f82b0d537a715a886.tar.xz
Fix deprecated function call issues with Qt 5.13
Update to mtxclient 0.3.0
Diffstat (limited to 'src/timeline/widgets')
-rw-r--r--src/timeline/widgets/AudioItem.cpp2
-rw-r--r--src/timeline/widgets/FileItem.cpp2
-rw-r--r--src/timeline/widgets/ImageItem.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/timeline/widgets/AudioItem.cpp b/src/timeline/widgets/AudioItem.cpp

index 72332174..8cc2ba8f 100644 --- a/src/timeline/widgets/AudioItem.cpp +++ b/src/timeline/widgets/AudioItem.cpp
@@ -163,7 +163,7 @@ AudioItem::resizeEvent(QResizeEvent *event) QFontMetrics fm(font); const int computedWidth = std::min( - fm.width(text_) + 2 * IconRadius + VerticalPadding * 2 + TextPadding, (double)MaxWidth); + fm.horizontalAdvance(text_) + 2 * IconRadius + VerticalPadding * 2 + TextPadding, (double)MaxWidth); resize(computedWidth, Height); diff --git a/src/timeline/widgets/FileItem.cpp b/src/timeline/widgets/FileItem.cpp
index e97554e2..903fc4b2 100644 --- a/src/timeline/widgets/FileItem.cpp +++ b/src/timeline/widgets/FileItem.cpp
@@ -154,7 +154,7 @@ FileItem::resizeEvent(QResizeEvent *event) QFontMetrics fm(font); const int computedWidth = std::min( - fm.width(text_) + 2 * IconRadius + VerticalPadding * 2 + TextPadding, (double)MaxWidth); + fm.horizontalAdvance(text_) + 2 * IconRadius + VerticalPadding * 2 + TextPadding, (double)MaxWidth); resize(computedWidth, Height); diff --git a/src/timeline/widgets/ImageItem.cpp b/src/timeline/widgets/ImageItem.cpp
index 4ee9e42a..79a66c4d 100644 --- a/src/timeline/widgets/ImageItem.cpp +++ b/src/timeline/widgets/ImageItem.cpp
@@ -192,7 +192,7 @@ ImageItem::paintEvent(QPaintEvent *event) if (image_.isNull()) { QString elidedText = metrics.elidedText(text_, Qt::ElideRight, max_width_ - 10); - setFixedSize(metrics.width(elidedText), fontHeight); + setFixedSize(metrics.horizontalAdvance(elidedText), fontHeight); painter.setFont(font); painter.setPen(QPen(QColor(66, 133, 244)));