Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
mirror of https://github.com/clementine-player/Clementine synced 2024-12-19 21:04:08 +01:00
Code Issues Releases Wiki Activity

Add support for monitors in portrait mode

Browse Source 
Album covers bound to width or height, whichever is smaller
This commit is contained in:
Mark Furneaux 2014-05-03 09:54:19 -04:00
parent 9156f8f389
commit 394d8e7b51
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/ui/albumcoverchoicecontroller.cpp
View File

@ -133,7 +133,7 @@ void AlbumCoverChoiceController::SaveCoverToFile(const Song& song,
QString extension = save_filename.right(4); QString extension = save_filename.right(4);
if (!extension.startsWith('.') || if (!extension.startsWith('.') ||
!QImageWriter::supportedImageFormats().contains( !QImageWriter::supportedImageFormats().contains(
extension.right(3).toUtf8())) { extension.right(3).toUtf8())) {
save_filename.append(".jpg"); save_filename.append(".jpg");
} }
@ -211,17 +211,28 @@ void AlbumCoverChoiceController::ShowCover(const Song& song) {
song.art_automatic(), song.art_manual(), song.url().toLocalFile())); song.art_automatic(), song.art_manual(), song.url().toLocalFile()));
// add (WxHpx) to the title before possibly resizing // add (WxHpx) to the title before possibly resizing
title_text += " (" + QString::number(label->pixmap()->width()) + title_text += " (" + QString::number(label->pixmap()->width()) + "x" +
"x" + QString::number(label->pixmap()->height()) + "px)"; QString::number(label->pixmap()->height()) + "px)";
// if the cover is larger than the screen, resize the window // if the cover is larger than the screen, resize the window
// 85% seems to be enough to account for title bar and taskbar etc. // 85% seems to be enough to account for title bar and taskbar etc.
QDesktopWidget desktop; QDesktopWidget desktop;
int desktop_height = desktop.geometry().height(); int desktop_height = desktop.geometry().height();
const int new_height = (double)desktop_height * 0.85; int desktop_width = desktop.geometry().width();
if (new_height < label->pixmap()->height()) {
label->setPixmap(label->pixmap()->scaledToHeight(new_height, // resize differently if monitor is in portrait mode
Qt::SmoothTransformation)); if (desktop_width < desktop_height) {
const int new_width = (double)desktop_width * 0.95;
if (new_width < label->pixmap()->width()) {
label->setPixmap(
label->pixmap()->scaledToWidth(new_width, Qt::SmoothTransformation));
}
} else {
const int new_height = (double)desktop_height * 0.85;
if (new_height < label->pixmap()->height()) {
label->setPixmap(label->pixmap()->scaledToHeight(
new_height, Qt::SmoothTransformation));
}
} }
dialog->setWindowTitle(title_text); dialog->setWindowTitle(title_text);
@ -264,7 +275,6 @@ void AlbumCoverChoiceController::SaveCover(Song* song, const QString& cover) {
QString AlbumCoverChoiceController::SaveCoverInCache(const QString& artist, QString AlbumCoverChoiceController::SaveCoverInCache(const QString& artist,
const QString& album, const QString& album,
const QImage& image) { const QImage& image) {
// Hash the artist and album into a filename for the image // Hash the artist and album into a filename for the image
QString filename(Utilities::Sha1CoverHash(artist, album).toHex() + ".jpg"); QString filename(Utilities::Sha1CoverHash(artist, album).toHex() + ".jpg");
QString path(AlbumCoverLoader::ImageCacheDir() + "/" + filename); QString path(AlbumCoverLoader::ImageCacheDir() + "/" + filename);