dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ifdef QFontMetrics::horizontalAdvance to make it work with older Qt

Browse Source
This commit is contained in:
Jonas Kvinge
2019-07-08 23:27:45 +02:00
parent 4150e3efde
commit 5f7efee00e
10 changed files with 52 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/playlist/playlistdelegates.cpp
View File

@@ -117,7 +117,13 @@ void QueuedItemDelegate::DrawBox(QPainter *painter, const QRect &line_rect, cons
smaller.setPointSize(smaller.pointSize() - 1);
smaller.setBold(true);
if (width == -1) width = QFontMetrics(font).horizontalAdvance(text + " ");
if (width == -1) {
#if (QT_VERSION >= QT_VERSION_CHECK(5, 11, 0))
width = QFontMetrics(font).horizontalAdvance(text + " ");
#else
width = QFontMetrics(font).width(text + " ");
#endif
}
QRect rect(line_rect);
rect.setLeft(rect.right() - width - kQueueBoxBorder);

4
src/playlist/playlistview.cpp
View File

@@ -100,7 +100,11 @@ void PlaylistProxyStyle::drawControl(ControlElement element, const QStyleOption
const QFontMetrics &font_metrics = header_option->fontMetrics;
// Spaces added to make transition less abrupt
#if (QT_VERSION >= QT_VERSION_CHECK(5, 11, 0))
if (rect.width() < font_metrics.horizontalAdvance(text + " ")) {
#else
if (rect.width() < font_metrics.width(text + " ")) {
#endif
const Playlist::Column column = static_cast<Playlist::Column>(header_option->section);
QStyleOptionHeader new_option(*header_option);
new_option.text = Playlist::abbreviated_column_name(column);