Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
mirror of https://github.com/clementine-player/Clementine synced 2025-02-05 05:38:45 +01:00
Code Issues Releases Wiki Activity

Merge pull request #4327 from TheUbuntuGuy/coverchoicecontroller

Browse Source 
Fix oversized album cover art.  Fixes #1260
This commit is contained in:
David Sansome 2014-05-04 14:00:41 +10:00
commit 0d71067333
1 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/ui/albumcoverchoicecontroller.cpp
View File

@ -30,6 +30,7 @@
#include "ui/iconloader.h"
#include <QAction>
#include <QDesktopWidget>
#include <QDialog>
#include <QDragEnterEvent>
#include <QFileDialog>
@ -132,7 +133,7 @@ void AlbumCoverChoiceController::SaveCoverToFile(const Song& song,
QString extension = save_filename.right(4);
if (!extension.startsWith('.') ||
!QImageWriter::supportedImageFormats().contains(
extension.right(3).toUtf8())) {
extension.right(3).toUtf8())) {
save_filename.append(".jpg");
}
@ -205,13 +206,37 @@ void AlbumCoverChoiceController::ShowCover(const Song& song) {
if (!song.album().isEmpty()) title_text += " - " + song.album();
dialog->setWindowTitle(title_text);
QLabel* label = new QLabel(dialog);
label->setPixmap(AlbumCoverLoader::TryLoadPixmap(
song.art_automatic(), song.art_manual(), song.url().toLocalFile()));
dialog->resize(label->pixmap()->size());
// add (WxHpx) to the title before possibly resizing
title_text += " (" + QString::number(label->pixmap()->width()) + "x" +
QString::number(label->pixmap()->height()) + "px)";
// if the cover is larger than the screen, resize the window
// 85% seems to be enough to account for title bar and taskbar etc.
QDesktopWidget desktop;
int desktop_height = desktop.geometry().height();
int desktop_width = desktop.geometry().width();
// resize differently if monitor is in portrait mode
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->setFixedSize(label->pixmap()->size());
dialog->show();
}
@ -250,7 +275,6 @@ void AlbumCoverChoiceController::SaveCover(Song* song, const QString& cover) {
QString AlbumCoverChoiceController::SaveCoverInCache(const QString& artist,
const QString& album,
const QImage& image) {
// Hash the artist and album into a filename for the image
QString filename(Utilities::Sha1CoverHash(artist, album).toHex() + ".jpg");
QString path(AlbumCoverLoader::ImageCacheDir() + "/" + filename);