diff --git a/support/fancytabwidget.cpp b/support/fancytabwidget.cpp index 3e4464ebc..0ef3d01d8 100644 --- a/support/fancytabwidget.cpp +++ b/support/fancytabwidget.cpp @@ -90,7 +90,7 @@ static void drawIcon(const QIcon &icon, const QRect &r, QPainter *p, const QSize #else QPixmap px = icon.pixmap(iconSize, selected ? QIcon::Selected : QIcon::Normal); #endif - QSize layoutSize = px.size() / px.devicePixelRatio(); + QSize layoutSize = px.size() / px.devicePixelRatioF(); p->drawPixmap(r.x()+(r.width()-layoutSize.width())/2.0, r.y()+(r.height()-layoutSize.height())/2.0, layoutSize.width(), layoutSize.height(), px); } diff --git a/support/pagewidget.cpp b/support/pagewidget.cpp index 1f7079483..ec3afdac6 100644 --- a/support/pagewidget.cpp +++ b/support/pagewidget.cpp @@ -121,7 +121,7 @@ public: const QPixmap pixmap = icon.pixmap(iconSize, iconSize); QFontMetrics fm = painter->fontMetrics(); - QSize layoutSize = pixmap.size() / pixmap.devicePixelRatio(); + QSize layoutSize = pixmap.size() / pixmap.devicePixelRatioF(); QTextLayout iconTextLayout(text, option.font); QTextOption textOption(Qt::AlignHCenter); @@ -180,7 +180,7 @@ public: QFontMetrics fm = option.fontMetrics; int gap = fm.height(); - QSize layoutSize = pixmap.size() / pixmap.devicePixelRatio(); + QSize layoutSize = pixmap.size() / pixmap.devicePixelRatioF(); if (layoutSize.height() == 0) { /** diff --git a/widgets/actionitemdelegate.cpp b/widgets/actionitemdelegate.cpp index ce38511b6..6a0f4c2f4 100644 --- a/widgets/actionitemdelegate.cpp +++ b/widgets/actionitemdelegate.cpp @@ -147,7 +147,7 @@ void ActionItemDelegate::drawIcons(QPainter *painter, const QRect &r, bool mouse foreach (const QPointer &a, actions) { QPixmap pix=a->icon().pixmap(QSize(iconSize, iconSize)); - QSize pixSize = pix.isNull() ? QSize(0, 0) : (pix.size() / pix.devicePixelRatio()); + QSize pixSize = pix.isNull() ? QSize(0, 0) : (pix.size() / pix.devicePixelRatioF()); if (!pix.isNull() && actionRect.width()>=pixSize.width()/* && r.x()>=0 && r.y()>=0*/) { drawBgnd(painter, actionRect, lightBgnd); diff --git a/widgets/coverwidget.cpp b/widgets/coverwidget.cpp index 2452ad2d8..02c7a59f4 100644 --- a/widgets/coverwidget.cpp +++ b/widgets/coverwidget.cpp @@ -106,7 +106,7 @@ void CoverLabel::paintEvent(QPaintEvent *) return; } QPainter p(this); - QSize layoutSize = pix.size() / pix.devicePixelRatio(); + QSize layoutSize = pix.size() / pix.devicePixelRatioF(); QRect r((width()-layoutSize.width())/2, (height()-layoutSize.height())/2, layoutSize.width(), layoutSize.height()); p.drawPixmap(r, pix); if (underMouse()) { diff --git a/widgets/groupedview.cpp b/widgets/groupedview.cpp index f08d32c96..e7777f44e 100644 --- a/widgets/groupedview.cpp +++ b/widgets/groupedview.cpp @@ -367,13 +367,13 @@ void GroupedViewDelegate::paint(QPainter *painter, const QStyleOptionViewItem &o pix=cover ? *cover : (stream && !song.isCdda() ? Icons::self()->streamIcon : Icons::self()->albumIcon(constCoverSize)).pixmap(constCoverSize, constCoverSize); } - int maxSize=constCoverSize*pix.devicePixelRatio(); + int maxSize=constCoverSize*pix.devicePixelRatioF(); if (pix.width()>maxSize) { pix=pix.scaled(maxSize, maxSize, Qt::KeepAspectRatio, Qt::SmoothTransformation); } - QSize pixSize = pix.isNull() ? QSize(0, 0) : (pix.size() / pix.devicePixelRatio()); + QSize pixSize = pix.isNull() ? QSize(0, 0) : (pix.size() / pix.devicePixelRatioF()); if (rtl) { painter->drawPixmap(r.x()+r.width()-(pixSize.width()-constBorder), r.y()+((r.height()-pixSize.height())/2), pixSize.width(), pixSize.height(), pix); diff --git a/widgets/itemview.cpp b/widgets/itemview.cpp index 247907fc7..de966a589 100644 --- a/widgets/itemview.cpp +++ b/widgets/itemview.cpp @@ -264,7 +264,7 @@ public: r.adjust(constBorder, 0, -constBorder, 0); } if (!pix.isNull()) { - QSize layoutSize = pix.size() / pix.devicePixelRatio(); + QSize layoutSize = pix.size() / pix.devicePixelRatioF(); int adjust=qMax(layoutSize.width(), layoutSize.height()); if (AP_VTop==actionPos) { int xpos=r.x()+((r.width()-layoutSize.width())/2); @@ -466,7 +466,7 @@ public: } if (!pix.isNull()) { - QSize layoutSize = pix.size() / pix.devicePixelRatio(); + QSize layoutSize = pix.size() / pix.devicePixelRatioF(); int adjust=qMax(layoutSize.width(), layoutSize.height()); if (rtl) { painter->drawPixmap(r.x()+r.width()-layoutSize.width(), r.y()+((r.height()-layoutSize.height())/2), layoutSize.width(), layoutSize.height(), pix); diff --git a/widgets/ratingwidget.cpp b/widgets/ratingwidget.cpp index 1ad2a80f2..ab65a8e2c 100644 --- a/widgets/ratingwidget.cpp +++ b/widgets/ratingwidget.cpp @@ -40,7 +40,7 @@ RatingPainter::RatingPainter(int s) , pixmapSize((starSz*constNumStars)+(constBorder*(constNumStars-1)), starSz) , col(QApplication::palette().text().color()) { - pixelRatio=Icon("dialog-ok").pixmap(16, 16).devicePixelRatio(); + pixelRatio=Icon("dialog-ok").pixmap(16, 16).devicePixelRatioF(); } void RatingPainter::paint(QPainter *p, const QRect &r, int rating) @@ -49,7 +49,7 @@ void RatingPainter::paint(QPainter *p, const QRect &r, int rating) return; } - if (!isNull() && !Utils::equal(pixelRatio, pixmaps[0].devicePixelRatio())) { + if (!isNull() && !Utils::equal(pixelRatio, pixmaps[0].devicePixelRatioF())) { pixmaps[0]=QPixmap(); } @@ -90,7 +90,7 @@ void RatingPainter::paint(QPainter *p, const QRect &r, int rating) int fullStars=rating/Song::Rating_Step; bool half=allowHalfStars && rating%Song::Rating_Step; - QSize layoutSize = pixmaps[0].size() / pixmaps[0].devicePixelRatio(); + QSize layoutSize = pixmaps[0].size() / pixmaps[0].devicePixelRatioF(); QRect pr(r.x(), r.y()+(r.height()-layoutSize.width())/2, layoutSize.width(), layoutSize.height()); for (int i=0; i