From c3712eba2762b53e5cb0c63c32b497742202f1fe Mon Sep 17 00:00:00 2001 From: Keith Edmunds Date: Fri, 30 Sep 2022 21:45:15 +0100 Subject: [PATCH] Switch to correct tab when clicking on next/current header --- app/musicmuster.py | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/app/musicmuster.py b/app/musicmuster.py index c5c9734..b5634fb 100755 --- a/app/musicmuster.py +++ b/app/musicmuster.py @@ -215,10 +215,8 @@ class Window(QMainWindow, Ui_MainWindow): self.btnFade.clicked.connect(self.fade) self.btnHidePlayed.clicked.connect(self.hide_played) self.btnStop.clicked.connect(self.stop) - self.hdrCurrentTrack.clicked.connect( - lambda: self.tabPlaylist.currentWidget().scroll_current_to_top()) - self.hdrNextTrack.clicked.connect( - lambda: self.tabPlaylist.currentWidget().scroll_next_to_top()) + self.hdrCurrentTrack.clicked.connect(self.show_current) + self.hdrNextTrack.clicked.connect(self.show_next) self.tabPlaylist.currentChanged.connect( lambda: self.tabPlaylist.currentWidget().tab_visible()) self.tabPlaylist.tabCloseRequested.connect(self.close_tab) @@ -772,6 +770,20 @@ class Window(QMainWindow, Ui_MainWindow): idx = self.tabPlaylist.indexOf(widget) self.tabPlaylist.tabBar().setTabTextColor(idx, colour) + def show_current(self) -> None: + """Scroll to show current track""" + + if self.current_track_playlist_tab != self.visible_playlist_tab: + self.tabPlaylist.setCurrentWidget(self.current_track_playlist_tab) + self.tabPlaylist.currentWidget().scroll_current_to_top() + + def show_next(self) -> None: + """Scroll to show next track""" + + if self.next_track_playlist_tab != self.visible_playlist_tab: + self.tabPlaylist.setCurrentWidget(self.next_track_playlist_tab) + self.tabPlaylist.currentWidget().scroll_next_to_top() + def stop(self) -> None: """Stop playing immediately"""