mirror/mpdevil
1
0
Fork 0
mirror of https://github.com/SoongNoonien/mpdevil.git synced 2023-08-10 21:12:44 +03:00
Code Issues Projects Releases Wiki Activity

separated selecting and scrolling in SelectionList

Browse Source
This commit is contained in:
Martin Wagner 2022-08-27 14:05:10 +02:00
parent 76c27816a8
commit 98d1a140bf
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/mpdevil.py
View File

@ -1847,7 +1847,6 @@ class SelectionList(TreeView):
def select_path(self, path): def select_path(self, path):
self._selection.select_path(path) self._selection.select_path(path)
self.scroll_to_path(path)
def select(self, item): def select(self, item):
row_num=len(self._store) row_num=len(self._store)
@ -1869,12 +1868,9 @@ class SelectionList(TreeView):
def get_item_selected(self): def get_item_selected(self):
return self.get_item_at_path(self.get_path_selected()) return self.get_item_at_path(self.get_path_selected())
def scroll_to_path(self, path):
self.set_cursor(Gtk.TreePath(len(self._store)), None, False) # unset cursor
self.save_scroll_to_cell(path, None, True, 0.25)
def scroll_to_selected(self): def scroll_to_selected(self):
self.scroll_to_path(self.get_path_selected()) self.set_cursor(Gtk.TreePath(len(self._store)), None, False) # unset cursor
self.save_scroll_to_cell(self._selected_path, None, True, 0.25)
def _on_selection_changed(self, *args): def _on_selection_changed(self, *args):
if (treeiter:=self._selection.get_selected()[1]) is not None: if (treeiter:=self._selection.get_selected()[1]) is not None:
@ -1892,9 +1888,6 @@ class GenreList(SelectionList):
self._client.emitter.connect_after("reconnected", self._on_reconnected) self._client.emitter.connect_after("reconnected", self._on_reconnected)
self._client.emitter.connect("updated_db", self._refresh) self._client.emitter.connect("updated_db", self._refresh)
def deactivate(self):
self.select_all()
def _refresh(self, *args): def _refresh(self, *args):
l=self._client.comp_list("genre") l=self._client.comp_list("genre")
self.set_items(list(zip(l,l))) self.set_items(list(zip(l,l)))
@ -1950,6 +1943,7 @@ class ArtistList(SelectionList):
self.select_path(Gtk.TreePath(1)) self.select_path(Gtk.TreePath(1))
else: else:
self.select_path(Gtk.TreePath(0)) self.select_path(Gtk.TreePath(0))
self.scroll_to_selected()
def _on_button_press_event(self, widget, event): def _on_button_press_event(self, widget, event):
if (path_re:=widget.get_path_at_pos(int(event.x), int(event.y))) is not None: if (path_re:=widget.get_path_at_pos(int(event.x), int(event.y))) is not None:
@ -2272,19 +2266,18 @@ class Browser(Gtk.Paned):
song=self._client.currentsong() song=self._client.currentsong()
artist,genre=self._artist_list.get_artist_selected() artist,genre=self._artist_list.get_artist_selected()
if genre is None or song["genre"][0] == genre: if genre is None or song["genre"][0] == genre:
if artist is None or song["albumartist"][0] == artist: if artist is not None and song["albumartist"][0] != artist:
self._artist_list.scroll_to_selected()
else:
self._artist_list.select(song["albumartist"][0]) self._artist_list.select(song["albumartist"][0])
self._genre_list.scroll_to_selected()
else: else:
self._genre_list.deactivate() self._genre_list.select_all()
self._genre_list.scroll_to_selected()
self._artist_list.scroll_to_selected()
self._album_list.scroll_to_current_album() self._album_list.scroll_to_current_album()
def _on_genre_filter_changed(self, settings, key): def _on_genre_filter_changed(self, settings, key):
if self._client.connected(): if self._client.connected():
if not settings.get_boolean(key): if not settings.get_boolean(key):
self._genre_list.deactivate() self._genre_list.select_all()
############ ############
# playlist # # playlist #