Centring current track (Player) and selected element after Back button

[someplayer] / src / playerform.cpp

diff --git a/src/playerform.cpp b/src/playerform.cpp
index 6309dbc..4be237f 100644 (file)
--- a/src/playerform.cpp
+++ b/src/playerform.cpp
@@ -108,7 +108,7 @@ PlayerForm::PlayerForm(Library* lib, QWidget *parent) :
        _cover->setMinimumSize(300, 300);
        _cover->setMaximumSize(300, 300);
        _cover->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
-       _cover->setScaledContents(true);
+       _cover->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
        _cover->setPixmap(QPixmap::fromImage(_coverfinder->defaultCover()));
 
        connect(ui->libraryButton, SIGNAL(clicked()), this, SLOT(_library()));
@@ -222,7 +222,7 @@ void PlayerForm::_track_changed(Track track) {
        int id = _current_playlist.tracks().indexOf(track);
        QModelIndex index = _model->index(id, 0);
        ui->playlistView->setCurrentIndex(index);
-       ui->playlistView->scrollTo(index);
+       ui->playlistView->scrollTo(index, QAbstractItemView::PositionAtCenter);
        _track_renderer->setActiveRow(id);
        ui->playlistView->hide();
        ui->playlistView->show();
@@ -240,7 +240,7 @@ void PlayerForm::_display_track(Track track) {
        ui->seekSlider->setMinimum(0);
        ui->seekSlider->setMaximum(track.metadata().length());
        _tick(0, track.metadata().length());
-       _coverfinder->find(QFileInfo(track.source()));
+       _coverfinder->find(track);
 }
 
 void PlayerForm::_tick(int done, int all) {
@@ -342,7 +342,7 @@ void PlayerForm::nextItem() {
        }
        QModelIndex id = _model->index(_search_current_id, 1);
        _track_renderer->setSearchRow(_search_current_id);
-       ui->playlistView->scrollTo(id);
+       ui->playlistView->scrollTo(id, QAbstractItemView::PositionAtCenter);
        ui->playlistView->hide();
        ui->playlistView->show();
 }
@@ -358,7 +358,7 @@ void PlayerForm::prevItem() {
        }
        QModelIndex id = _model->index(_search_current_id, 1);
        _track_renderer->setSearchRow(_search_current_id);
-       ui->playlistView->scrollTo(id);
+       ui->playlistView->scrollTo(id, QAbstractItemView::PositionAtCenter);
        ui->playlistView->hide();
        ui->playlistView->show();
 }
@@ -366,7 +366,7 @@ void PlayerForm::prevItem() {
 void PlayerForm::cancelSearch() {
        _search_pattern = "";
        _track_renderer->setSearchRow(-1);
-       ui->playlistView->scrollTo(_model->index(_track_renderer->activeRow(), 1));
+       ui->playlistView->scrollTo(_model->index(_track_renderer->activeRow(), 1), QAbstractItemView::PositionAtCenter);
        ui->playlistView->hide();
        ui->playlistView->show();
 }
@@ -663,7 +663,7 @@ void PlayerForm::hideCountdown() {
 }
 
 void PlayerForm::_display_cover(QImage image) {
-       QPixmap p = QPixmap::fromImage(image);
+       QPixmap p = QPixmap::fromImage(image).scaled(_cover->width(), _cover->height(), Qt::KeepAspectRatio, Qt::SmoothTransformation);
        _cover->setPixmap(p);
 }