From ff8c61dbca42009246236f746cfdea651187bb9b Mon Sep 17 00:00:00 2001 From: David Edmundson Date: Wed, 25 Mar 2015 12:41:18 +0100 Subject: Copy device pixel ratio from original pixmap inside KPixmapModifier::scale --- src/kitemviews/private/kpixmapmodifier.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/kitemviews/private/kpixmapmodifier.cpp') diff --git a/src/kitemviews/private/kpixmapmodifier.cpp b/src/kitemviews/private/kpixmapmodifier.cpp index c564ecc30..ee1f84366 100644 --- a/src/kitemviews/private/kpixmapmodifier.cpp +++ b/src/kitemviews/private/kpixmapmodifier.cpp @@ -347,6 +347,7 @@ void KPixmapModifier::scale(QPixmap& pixmap, const QSize& scaledSize) }}; QPixmap scaledPixmap(scaledPixmapSize); + scaledPixmap.setDevicePixelRatio(pixmap.devicePixelRatio()); scaledPixmap.fill(Qt::transparent); Display* dpy = QX11Info::display(); @@ -364,7 +365,9 @@ void KPixmapModifier::scale(QPixmap& pixmap, const QSize& scaledSize) pixmap = pixmap.scaled(scaledSize, Qt::KeepAspectRatio, Qt::SmoothTransformation); } #else + qreal dpr = pixmap.devicePixelRatio(); pixmap = pixmap.scaled(scaledSize, Qt::KeepAspectRatio, Qt::SmoothTransformation); + pixmap.setDevicePixelRatio(dpr); #endif } -- cgit v1.3 From 35c0972671c1f90f76d8d86b002b2e1f8bac79dd Mon Sep 17 00:00:00 2001 From: David Edmundson Date: Thu, 26 Mar 2015 16:06:52 +0100 Subject: Make KPixmapModifier::applyFrame handle high DPI images --- src/kitemviews/kfileitemmodelrolesupdater.cpp | 9 ++++----- src/kitemviews/private/kpixmapmodifier.cpp | 10 ++++++---- src/kitemviews/private/kpixmapmodifier.h | 17 +++++++++++++++++ 3 files changed, 27 insertions(+), 9 deletions(-) (limited to 'src/kitemviews/private/kpixmapmodifier.cpp') diff --git a/src/kitemviews/kfileitemmodelrolesupdater.cpp b/src/kitemviews/kfileitemmodelrolesupdater.cpp index c6ce877e3..068118983 100644 --- a/src/kitemviews/kfileitemmodelrolesupdater.cpp +++ b/src/kitemviews/kfileitemmodelrolesupdater.cpp @@ -493,7 +493,7 @@ void KFileItemModelRolesUpdater::slotGotPreview(const KFileItem& item, const QPi const QString mimeTypeGroup = mimeType.left(slashIndex); if (mimeTypeGroup == QLatin1String("image")) { if (m_enlargeSmallPreviews) { - KPixmapModifier::applyFrame(scaledPixmap, m_iconSize * qApp->devicePixelRatio()); + KPixmapModifier::applyFrame(scaledPixmap, m_iconSize * scaledPixmap.devicePixelRatio()); } else { // Assure that small previews don't get enlarged. Instead they // should be shown centered within the frame. @@ -502,7 +502,7 @@ void KFileItemModelRolesUpdater::slotGotPreview(const KFileItem& item, const QPi scaledPixmap.height() < contentSize.height(); if (enlargingRequired) { QSize frameSize = scaledPixmap.size(); - frameSize.scale(m_iconSize * qApp->devicePixelRatio(), Qt::KeepAspectRatio); + frameSize.scale(m_iconSize * scaledPixmap.devicePixelRatio(), Qt::KeepAspectRatio); QPixmap largeFrame(frameSize); largeFrame.fill(Qt::transparent); @@ -517,13 +517,12 @@ void KFileItemModelRolesUpdater::slotGotPreview(const KFileItem& item, const QPi } else { // The image must be shrinked as it is too large to fit into // the available icon size - KPixmapModifier::applyFrame(scaledPixmap, m_iconSize * qApp->devicePixelRatio()); + KPixmapModifier::applyFrame(scaledPixmap, m_iconSize * scaledPixmap.devicePixelRatio()); } } } else { - KPixmapModifier::scale(scaledPixmap, m_iconSize * qApp->devicePixelRatio()); + KPixmapModifier::scale(scaledPixmap, m_iconSize * scaledPixmap.devicePixelRatio()); } - scaledPixmap.setDevicePixelRatio(qApp->devicePixelRatio()); QHash data = rolesData(item); diff --git a/src/kitemviews/private/kpixmapmodifier.cpp b/src/kitemviews/private/kpixmapmodifier.cpp index ee1f84366..3e0edf02c 100644 --- a/src/kitemviews/private/kpixmapmodifier.cpp +++ b/src/kitemviews/private/kpixmapmodifier.cpp @@ -374,14 +374,16 @@ void KPixmapModifier::scale(QPixmap& pixmap, const QSize& scaledSize) void KPixmapModifier::applyFrame(QPixmap& icon, const QSize& scaledSize) { static TileSet tileSet; + qreal dpr = icon.devicePixelRatio(); // Resize the icon to the maximum size minus the space required for the frame - const QSize size(scaledSize.width() - TileSet::LeftMargin - TileSet::RightMargin, - scaledSize.height() - TileSet::TopMargin - TileSet::BottomMargin); + const QSize size(scaledSize.width() - (TileSet::LeftMargin + TileSet::RightMargin) * dpr, + scaledSize.height() - (TileSet::TopMargin + TileSet::BottomMargin) * dpr); scale(icon, size); - QPixmap framedIcon(icon.size().width() + TileSet::LeftMargin + TileSet::RightMargin, - icon.size().height() + TileSet::TopMargin + TileSet::BottomMargin); + QPixmap framedIcon(icon.size().width() + (TileSet::LeftMargin + TileSet::RightMargin) * dpr, + icon.size().height() + (TileSet::TopMargin + TileSet::BottomMargin * dpr) ); + framedIcon.setDevicePixelRatio(dpr); framedIcon.fill(Qt::transparent); QPainter painter; diff --git a/src/kitemviews/private/kpixmapmodifier.h b/src/kitemviews/private/kpixmapmodifier.h index e8ca11ac1..9089a1001 100644 --- a/src/kitemviews/private/kpixmapmodifier.h +++ b/src/kitemviews/private/kpixmapmodifier.h @@ -28,8 +28,25 @@ class QSize; class DOLPHIN_EXPORT KPixmapModifier { public: + /** + * Scale a pixmap to a given size. + * @arg scaledSize is assumed to be the scaled to the same device pixel ratio as the source pixmap + * @arg scaledSize is in device pixels + */ static void scale(QPixmap& pixmap, const QSize& scaledSize); + + /** + * Resize and paint a frame round an icon + * @arg scaledSize is assumed to be the scaled to the same device pixel ratio as the source icon + */ static void applyFrame(QPixmap& icon, const QSize& scaledSize); + + /** + * return and paint a frame round an icon + * @arg framesize is in device-independent pixels + * @return is in device-indepent pixels + */ + static QSize sizeInsideFrame(const QSize& frameSize); }; -- cgit v1.3 From 1b6ee5d6cd918b81c59a5163c9d6371f35f9885c Mon Sep 17 00:00:00 2001 From: David Edmundson Date: Fri, 27 Mar 2015 15:43:06 +0100 Subject: review comments --- src/kitemviews/kfileitemlistview.cpp | 4 ++-- src/kitemviews/kfileitemmodelrolesupdater.cpp | 10 +++++----- src/kitemviews/kstandarditemlistwidget.cpp | 7 +++---- src/kitemviews/private/kpixmapmodifier.cpp | 14 ++++++++------ src/kitemviews/private/kpixmapmodifier.h | 3 ++- 5 files changed, 20 insertions(+), 18 deletions(-) (limited to 'src/kitemviews/private/kpixmapmodifier.cpp') diff --git a/src/kitemviews/kfileitemlistview.cpp b/src/kitemviews/kfileitemlistview.cpp index 18b193572..5efb820b0 100644 --- a/src/kitemviews/kfileitemlistview.cpp +++ b/src/kitemviews/kfileitemlistview.cpp @@ -156,9 +156,9 @@ QPixmap KFileItemListView::createDragPixmap(const KItemSet& indexes) const yCount = xCount; } - qreal dpr = scene()->views()[0]->devicePixelRatio(); + const qreal dpr = scene()->views()[0]->devicePixelRatio(); // Draw the selected items into the grid cells. - QPixmap dragPixmap(QSize(xCount * size + xCount, yCount * size + yCount)*dpr); + QPixmap dragPixmap(QSize(xCount * size + xCount, yCount * size + yCount) * dpr); dragPixmap.setDevicePixelRatio(dpr); dragPixmap.fill(Qt::transparent); diff --git a/src/kitemviews/kfileitemmodelrolesupdater.cpp b/src/kitemviews/kfileitemmodelrolesupdater.cpp index 068118983..b03fd9c1a 100644 --- a/src/kitemviews/kfileitemmodelrolesupdater.cpp +++ b/src/kitemviews/kfileitemmodelrolesupdater.cpp @@ -493,7 +493,7 @@ void KFileItemModelRolesUpdater::slotGotPreview(const KFileItem& item, const QPi const QString mimeTypeGroup = mimeType.left(slashIndex); if (mimeTypeGroup == QLatin1String("image")) { if (m_enlargeSmallPreviews) { - KPixmapModifier::applyFrame(scaledPixmap, m_iconSize * scaledPixmap.devicePixelRatio()); + KPixmapModifier::applyFrame(scaledPixmap, m_iconSize); } else { // Assure that small previews don't get enlarged. Instead they // should be shown centered within the frame. @@ -501,8 +501,8 @@ void KFileItemModelRolesUpdater::slotGotPreview(const KFileItem& item, const QPi const bool enlargingRequired = scaledPixmap.width() < contentSize.width() && scaledPixmap.height() < contentSize.height(); if (enlargingRequired) { - QSize frameSize = scaledPixmap.size(); - frameSize.scale(m_iconSize * scaledPixmap.devicePixelRatio(), Qt::KeepAspectRatio); + QSize frameSize = scaledPixmap.size() / scaledPixmap.devicePixelRatio(); + frameSize.scale(m_iconSize, Qt::KeepAspectRatio); QPixmap largeFrame(frameSize); largeFrame.fill(Qt::transparent); @@ -517,11 +517,11 @@ void KFileItemModelRolesUpdater::slotGotPreview(const KFileItem& item, const QPi } else { // The image must be shrinked as it is too large to fit into // the available icon size - KPixmapModifier::applyFrame(scaledPixmap, m_iconSize * scaledPixmap.devicePixelRatio()); + KPixmapModifier::applyFrame(scaledPixmap, m_iconSize); } } } else { - KPixmapModifier::scale(scaledPixmap, m_iconSize * scaledPixmap.devicePixelRatio()); + KPixmapModifier::scale(scaledPixmap, m_iconSize); } QHash data = rolesData(item); diff --git a/src/kitemviews/kstandarditemlistwidget.cpp b/src/kitemviews/kstandarditemlistwidget.cpp index 170517754..1112460a9 100644 --- a/src/kitemviews/kstandarditemlistwidget.cpp +++ b/src/kitemviews/kstandarditemlistwidget.cpp @@ -40,7 +40,6 @@ #include #include #include -#include #include // #define KSTANDARDITEMLISTWIDGET_DEBUG @@ -956,9 +955,8 @@ void KStandardItemListWidget::updatePixmapCache() } const QStringList overlays = values["iconOverlays"].toStringList(); m_pixmap = pixmapForIcon(iconName, overlays, maxIconHeight); -// qDebug() << "attempt 2 - setting pixmap to one of size " << m_pixmap.size() << m_pixmap.devicePixelRatio(); - } else if (m_pixmap.width() / qApp->devicePixelRatio() != maxIconWidth || m_pixmap.height() / qApp->devicePixelRatio() != maxIconHeight) { + } else if (m_pixmap.width() / m_pixmap.devicePixelRatio() != maxIconWidth || m_pixmap.height() / m_pixmap.devicePixelRatio() != maxIconHeight) { // A custom pixmap has been applied. Assure that the pixmap // is scaled to the maximum available size. KPixmapModifier::scale(m_pixmap, QSize(maxIconWidth, maxIconHeight) * qApp->devicePixelRatio()); @@ -1357,9 +1355,10 @@ void KStandardItemListWidget::updateAdditionalInfoTextColor() void KStandardItemListWidget::drawPixmap(QPainter* painter, const QPixmap& pixmap) { - if (m_scaledPixmapSize * qApp->devicePixelRatio() != pixmap.size()) { + if (m_scaledPixmapSize != pixmap.size() / pixmap.devicePixelRatio()) { QPixmap scaledPixmap = pixmap; KPixmapModifier::scale(scaledPixmap, m_scaledPixmapSize * qApp->devicePixelRatio()); + scaledPixmap.setDevicePixelRatio(qApp->devicePixelRatio()); painter->drawPixmap(m_pixmapPos, scaledPixmap); #ifdef KSTANDARDITEMLISTWIDGET_DEBUG diff --git a/src/kitemviews/private/kpixmapmodifier.cpp b/src/kitemviews/private/kpixmapmodifier.cpp index 3e0edf02c..4693b313a 100644 --- a/src/kitemviews/private/kpixmapmodifier.cpp +++ b/src/kitemviews/private/kpixmapmodifier.cpp @@ -38,6 +38,7 @@ #include #include #include +#include #include // for HAVE_XRENDER @@ -374,22 +375,23 @@ void KPixmapModifier::scale(QPixmap& pixmap, const QSize& scaledSize) void KPixmapModifier::applyFrame(QPixmap& icon, const QSize& scaledSize) { static TileSet tileSet; - qreal dpr = icon.devicePixelRatio(); + qreal dpr = qApp->devicePixelRatio(); // Resize the icon to the maximum size minus the space required for the frame - const QSize size(scaledSize.width() - (TileSet::LeftMargin + TileSet::RightMargin) * dpr, - scaledSize.height() - (TileSet::TopMargin + TileSet::BottomMargin) * dpr); - scale(icon, size); + const QSize size(scaledSize.width() - TileSet::LeftMargin - TileSet::RightMargin, + scaledSize.height() - TileSet::TopMargin - TileSet::BottomMargin); + scale(icon, size * dpr); + icon.setDevicePixelRatio(dpr); QPixmap framedIcon(icon.size().width() + (TileSet::LeftMargin + TileSet::RightMargin) * dpr, - icon.size().height() + (TileSet::TopMargin + TileSet::BottomMargin * dpr) ); + icon.size().height() + (TileSet::TopMargin + TileSet::BottomMargin) * dpr); framedIcon.setDevicePixelRatio(dpr); framedIcon.fill(Qt::transparent); QPainter painter; painter.begin(&framedIcon); painter.setCompositionMode(QPainter::CompositionMode_Source); - tileSet.paint(&painter, framedIcon.rect()); + tileSet.paint(&painter, QRect(QPoint(0,0), framedIcon.size() / dpr)); painter.setCompositionMode(QPainter::CompositionMode_SourceOver); painter.drawPixmap(TileSet::LeftMargin, TileSet::TopMargin, icon); diff --git a/src/kitemviews/private/kpixmapmodifier.h b/src/kitemviews/private/kpixmapmodifier.h index 9089a1001..e48abf515 100644 --- a/src/kitemviews/private/kpixmapmodifier.h +++ b/src/kitemviews/private/kpixmapmodifier.h @@ -37,7 +37,8 @@ public: /** * Resize and paint a frame round an icon - * @arg scaledSize is assumed to be the scaled to the same device pixel ratio as the source icon + * @arg scaledSize is in device-independent pixels + * The returned image will be scaled by the application devicePixelRatio */ static void applyFrame(QPixmap& icon, const QSize& scaledSize); -- cgit v1.3