1
0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-19 12:21:52 +02:00

* Make sure to close sub-page when using anchors.

This commit is contained in:
Christian Muehlhaeuser
2014-08-20 08:44:47 +02:00
parent 9e78aeb998
commit 60793e07be
2 changed files with 7 additions and 4 deletions

View File

@@ -207,7 +207,7 @@ ArtistInfoWidget::ArtistInfoWidget( const Tomahawk::artist_ptr& artist, QWidget*
topHitsFullView->setPlayableModel( m_topHitsModel ); topHitsFullView->setPlayableModel( m_topHitsModel );
m_stackedWidget->addWidget( topHitsFullView ); m_stackedWidget->addWidget( topHitsFullView );
connect( topHitsFullView, SIGNAL( closeClicked() ), SLOT( onTopHitsMoreClosed() ) ); connect( topHitsFullView, SIGNAL( closeClicked() ), SLOT( onPageClosed() ) );
} }
{ {
GridView* albumsFullView = new GridView( m_stackedWidget ); GridView* albumsFullView = new GridView( m_stackedWidget );
@@ -239,7 +239,7 @@ ArtistInfoWidget::ArtistInfoWidget( const Tomahawk::artist_ptr& artist, QWidget*
m_stackedWidget->addWidget( vbox ); m_stackedWidget->addWidget( vbox );
connect( captionLabel, SIGNAL( clicked() ), SLOT( onTopHitsMoreClosed() ) ); connect( captionLabel, SIGNAL( clicked() ), SLOT( onPageClosed() ) );
} }
{ {
@@ -477,7 +477,7 @@ ArtistInfoWidget::onAlbumsMoreClicked()
void void
ArtistInfoWidget::onTopHitsMoreClosed() ArtistInfoWidget::onPageClosed()
{ {
m_stackedWidget->setCurrentIndex( 0 ); m_stackedWidget->setCurrentIndex( 0 );
} }
@@ -487,6 +487,7 @@ void
ArtistInfoWidget::onMusicAnchorClicked() ArtistInfoWidget::onMusicAnchorClicked()
{ {
m_area->verticalScrollBar()->setValue( 0 ); m_area->verticalScrollBar()->setValue( 0 );
onPageClosed();
} }
@@ -494,6 +495,7 @@ void
ArtistInfoWidget::onBioAnchorClicked() ArtistInfoWidget::onBioAnchorClicked()
{ {
m_area->verticalScrollBar()->setValue( ui->biographyLabel->mapTo( m_widget, QPoint( 0, 0 ) ).y() - 32 ); m_area->verticalScrollBar()->setValue( ui->biographyLabel->mapTo( m_widget, QPoint( 0, 0 ) ).y() - 32 );
onPageClosed();
} }
@@ -501,4 +503,5 @@ void
ArtistInfoWidget::onRelatedArtistsAnchorClicked() ArtistInfoWidget::onRelatedArtistsAnchorClicked()
{ {
m_area->verticalScrollBar()->setValue( ui->relatedArtistsLabel->mapTo( m_widget, QPoint( 0, 0 ) ).y() - 32 ); m_area->verticalScrollBar()->setValue( ui->relatedArtistsLabel->mapTo( m_widget, QPoint( 0, 0 ) ).y() - 32 );
onPageClosed();
} }

View File

@@ -106,7 +106,7 @@ private slots:
void onBiographyLinkClicked( const QUrl& url ); void onBiographyLinkClicked( const QUrl& url );
void onAlbumsMoreClicked(); void onAlbumsMoreClicked();
void onTopHitsMoreClicked(); void onTopHitsMoreClicked();
void onTopHitsMoreClosed(); void onPageClosed();
void onMusicAnchorClicked(); void onMusicAnchorClicked();
void onBioAnchorClicked(); void onBioAnchorClicked();