thek0tyara/nheko
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Consider the scale ratio when scaling down images

Browse source 
fixes #393
This commit is contained in:
Konstantinos Sideris 2018-08-01 21:10:03 +03:00
parent 1f50d13b9f
commit b5b5faa5ec
5 changed files with 37 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/Utils.cpp
View file

@ -223,11 +223,41 @@ utils::scaleImageToPixmap(const QImage &img, int size)
return QPixmap();
const double sz =
ceil(QApplication::desktop()->screen()->devicePixelRatioF() * (double)size);
std::ceil(QApplication::desktop()->screen()->devicePixelRatioF() * (double)size);
return QPixmap::fromImage(
img.scaled(sz, sz, Qt::IgnoreAspectRatio, Qt::SmoothTransformation));
}
QPixmap
utils::scaleDown(uint64_t maxWidth, uint64_t maxHeight, const QPixmap &source)
{
if (source.isNull())
return QPixmap();
const double pixelRatio = QApplication::desktop()->screen()->devicePixelRatioF();
// Take into account the scale factor of the screen.
maxWidth = std::ceil(pixelRatio * (double)maxWidth);
maxHeight = std::ceil(pixelRatio * (double)maxHeight);
const double widthRatio = (double)maxWidth / (double)source.width();
const double heightRatio = (double)maxHeight / (double)source.height();
const double minAspectRatio = std::min(widthRatio, heightRatio);
// Size of the output image.
int w, h = 0;
if (minAspectRatio > 1) {
w = source.width();
h = source.height();
} else {
w = source.width() * minAspectRatio;
h = source.height() * minAspectRatio;
}
return source.scaled(w, h, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
}
QString
utils::mxcToHttp(const QUrl &url, const QString &server, int port)
{