From 3a8ea3be126981b9b48ff3f7a527e20ae308df92 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Wed, 14 Nov 2012 03:37:03 +0100 Subject: [PATCH] * Fixed jumping to current track when track is being played from the active page. --- src/libtomahawk/ViewManager.cpp | 12 +++++++++++- src/libtomahawk/ViewManager.h | 1 + 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/libtomahawk/ViewManager.cpp b/src/libtomahawk/ViewManager.cpp index 26eac5d61..d50e07111 100644 --- a/src/libtomahawk/ViewManager.cpp +++ b/src/libtomahawk/ViewManager.cpp @@ -473,6 +473,16 @@ ViewManager::historyForward() } +QList +ViewManager::allPages() const +{ + QList< ViewPage* > pages = m_pageHistoryBack + m_pageHistoryFwd; + pages << m_currentPage; + + return pages; +} + + QList ViewManager::historyPages() const { @@ -788,7 +798,7 @@ ViewManager::pageForPlaylist(const playlist_ptr& pl) const ViewPage* ViewManager::pageForInterface( Tomahawk::playlistinterface_ptr interface ) const { - QList< Tomahawk::ViewPage* > pages = historyPages(); + QList< Tomahawk::ViewPage* > pages = allPages(); for ( int i = 0; i < pages.count(); i++ ) { diff --git a/src/libtomahawk/ViewManager.h b/src/libtomahawk/ViewManager.h index c83a4730c..238897f02 100644 --- a/src/libtomahawk/ViewManager.h +++ b/src/libtomahawk/ViewManager.h @@ -147,6 +147,7 @@ public slots: void historyBack(); void historyForward(); + QList< Tomahawk::ViewPage* > allPages() const; QList< Tomahawk::ViewPage* > historyPages() const; void destroyPage( Tomahawk::ViewPage* page );