colin/sublime-music
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed a couple of display bugs

Browse Source
This commit is contained in:
Sumner Evans
2020-05-21 19:42:58 -06:00
parent 25db066345
commit 09f6a2afb3
3 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sublime/adapters/subsonic/adapter.py
View File

@@ -128,8 +128,9 @@ class SubsonicAdapter(Adapter):
# TODO (#112): support XML? # TODO (#112): support XML?
def initial_sync(self): def initial_sync(self):
print('initial_sync')
# Wait for the ping to happen. # Wait for the ping to happen.
tries = 5 tries = 0
while not self._server_available.value and tries < 5: while not self._server_available.value and tries < 5:
self._set_ping_status() self._set_ping_status()
tries += 1 tries += 1

18
sublime/ui/app_styles.css
View File

@@ -61,11 +61,14 @@
} }
#playlist-album-artwork { #playlist-album-artwork {
min-height: 200px;
min-width: 200px;
margin: 10px 15px 0 10px; margin: 10px 15px 0 10px;
} }
#artist-info-panel { #playlist-album-artwork.collapsed {
margin-bottom: 10px; min-height: 70px;
min-width: 70px;
} }
#playlist-name, #artist-detail-panel #artist-name { #playlist-name, #artist-detail-panel #artist-name {
@@ -210,9 +213,16 @@
} }
#artist-album-artwork { #artist-album-artwork {
min-width: 300px;
min-height: 300px;
margin: 10px 15px 0 10px; margin: 10px 15px 0 10px;
} }
#artist-album-artwork.collapsed {
min-width: 70px;
min-height: 70px;
}
#artist-album-list-artwork { #artist-album-list-artwork {
margin: 10px; margin: 10px;
} }
@@ -225,3 +235,7 @@
#album-list-song-list-spinner { #album-list-song-list-spinner {
margin: 15px; margin: 15px;
} }
#artist-info-panel {
margin-bottom: 10px;
}

8
sublime/ui/artists.py
View File

@@ -291,9 +291,9 @@ class ArtistDetailPanel(Gtk.Box):
if app_config.state.selected_artist_id is None: if app_config.state.selected_artist_id is None:
self.big_info_panel.hide() self.big_info_panel.hide()
self.album_list_scrolledwindow.hide() self.album_list_scrolledwindow.hide()
self.play_shuffle_buttons.hide()
else: else:
self.update_order_token += 1 self.update_order_token += 1
self.big_info_panel.show()
self.album_list_scrolledwindow.show() self.album_list_scrolledwindow.show()
self.update_artist_view( self.update_artist_view(
app_config.state.selected_artist_id, app_config.state.selected_artist_id,
@@ -316,6 +316,8 @@ class ArtistDetailPanel(Gtk.Box):
if order_token != self.update_order_token: if order_token != self.update_order_token:
return return
self.big_info_panel.show()
if app_config: if app_config:
self.artist_details_expanded = app_config.state.artist_details_expanded self.artist_details_expanded = app_config.state.artist_details_expanded
@@ -329,7 +331,7 @@ class ArtistDetailPanel(Gtk.Box):
self.artist_name.set_tooltip_text(artist.name) self.artist_name.set_tooltip_text(artist.name)
if self.artist_details_expanded: if self.artist_details_expanded:
self.show_all() self.artist_artwork.get_style_context().remove_class("collapsed")
self.artist_name.get_style_context().remove_class("collapsed") self.artist_name.get_style_context().remove_class("collapsed")
self.artist_artwork.set_image_size(300) self.artist_artwork.set_image_size(300)
self.artist_indicator.set_text("ARTIST") self.artist_indicator.set_text("ARTIST")
@@ -355,8 +357,8 @@ class ArtistDetailPanel(Gtk.Box):
else: else:
self.similar_artists_scrolledwindow.hide() self.similar_artists_scrolledwindow.hide()
else: else:
self.artist_artwork.get_style_context().add_class("collapsed")
self.artist_name.get_style_context().add_class("collapsed") self.artist_name.get_style_context().add_class("collapsed")
self.show_all()
self.artist_artwork.set_image_size(70) self.artist_artwork.set_image_size(70)
self.artist_indicator.hide() self.artist_indicator.hide()
self.artist_stats.hide() self.artist_stats.hide()