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

auto resize main cover

Browse Source
This commit is contained in:
Martin Wagner 2022-04-21 17:14:43 +02:00
parent 6198a821db
commit 67c914002d
2 changed files with 47 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
data/org.mpdevil.mpdevil.gschema.xml
View File

@ -16,6 +16,14 @@
<default>691</default> <default>691</default>
<summary>Default height of window</summary> <summary>Default height of window</summary>
</key> </key>
<key type="i" name="mini-player-width">
<default>300</default>
<summary>Default width of mini player</summary>
</key>
<key type="i" name="mini-player-height">
<default>300</default>
<summary>Default height of mini player</summary>
</key>
<key type="i" name="paned0"> <key type="i" name="paned0">
<default>350</default> <default>350</default>
<summary>Default position of cover/playlist separator</summary> <summary>Default position of cover/playlist separator</summary>
@ -44,10 +52,6 @@
<default>160</default> <default>160</default>
<summary>Size of covers in album view</summary> <summary>Size of covers in album view</summary>
</key> </key>
<key type="i" name="track-cover">
<default>350</default>
<summary>Size of main cover</summary>
</key>
<key type="i" name="icon-size"> <key type="i" name="icon-size">
<default>24</default> <default>24</default>
<summary>Size of icons in main control bar</summary> <summary>Size of icons in main control bar</summary>

66
src/mpdevil.py
View File

@ -600,23 +600,26 @@ class Song(collections.UserDict):
return f"{title}\n<small>{GLib.markup_escape_text(self.get_album_with_date())}</small>" return f"{title}\n<small>{GLib.markup_escape_text(self.get_album_with_date())}</small>"
class BinaryCover(bytes): class BinaryCover(bytes):
def get_pixbuf(self, size): def get_pixbuf(self, size=-1):
loader=GdkPixbuf.PixbufLoader() loader=GdkPixbuf.PixbufLoader()
try: try:
loader.write(self) loader.write(self)
loader.close() loader.close()
raw_pixbuf=loader.get_pixbuf() if size == -1:
ratio=raw_pixbuf.get_width()/raw_pixbuf.get_height() pixbuf=loader.get_pixbuf()
if ratio > 1:
pixbuf=raw_pixbuf.scale_simple(size,size/ratio,GdkPixbuf.InterpType.BILINEAR)
else: else:
pixbuf=raw_pixbuf.scale_simple(size*ratio,size,GdkPixbuf.InterpType.BILINEAR) raw_pixbuf=loader.get_pixbuf()
ratio=raw_pixbuf.get_width()/raw_pixbuf.get_height()
if ratio > 1:
pixbuf=raw_pixbuf.scale_simple(size,size/ratio,GdkPixbuf.InterpType.BILINEAR)
else:
pixbuf=raw_pixbuf.scale_simple(size*ratio,size,GdkPixbuf.InterpType.BILINEAR)
except gi.repository.GLib.Error: # load fallback if cover can't be loaded except gi.repository.GLib.Error: # load fallback if cover can't be loaded
pixbuf=GdkPixbuf.Pixbuf.new_from_file_at_size(FALLBACK_COVER, size, size) pixbuf=GdkPixbuf.Pixbuf.new_from_file_at_size(FALLBACK_COVER, size, size)
return pixbuf return pixbuf
class FileCover(str): class FileCover(str):
def get_pixbuf(self, size): def get_pixbuf(self, size=-1):
try: try:
pixbuf=GdkPixbuf.Pixbuf.new_from_file_at_size(self, size, size) pixbuf=GdkPixbuf.Pixbuf.new_from_file_at_size(self, size, size)
except gi.repository.GLib.Error: # load fallback if cover can't be loaded except gi.repository.GLib.Error: # load fallback if cover can't be loaded
@ -1066,7 +1069,6 @@ class ViewSettings(SettingsList):
row=ToggleRow(label, settings, key, restart_required) row=ToggleRow(label, settings, key, restart_required)
self.append(row) self.append(row)
int_data=( int_data=(
(_("Main cover size"), (100, 1200, 10), "track-cover"),
(_("Album view cover size"), (50, 600, 10), "album-cover"), (_("Album view cover size"), (50, 600, 10), "album-cover"),
(_("Action bar icon size"), (16, 64, 2), "icon-size"), (_("Action bar icon size"), (16, 64, 2), "icon-size"),
) )
@ -1211,7 +1213,6 @@ class SettingsDialog(Gtk.Dialog):
else: else:
super().__init__(title=_("Preferences"), transient_for=parent) super().__init__(title=_("Preferences"), transient_for=parent)
self.add_button(Gtk.STOCK_OK, Gtk.ResponseType.OK) self.add_button(Gtk.STOCK_OK, Gtk.ResponseType.OK)
self.set_default_size(500, 400)
# widgets # widgets
view=ViewSettings(settings) view=ViewSettings(settings)
@ -2872,30 +2873,31 @@ class CoverEventBox(Gtk.EventBox):
def _on_disconnected(self, *args): def _on_disconnected(self, *args):
self._album_popover.popdown() self._album_popover.popdown()
class MainCover(Gtk.Image): class MainCover(Gtk.DrawingArea):
def __init__(self, client, settings): def __init__(self, client, settings):
super().__init__() super().__init__()
self._client=client self._client=client
self._settings=settings self._settings=settings
# set default size self._pixbuf=GdkPixbuf.Pixbuf()
size=self._settings.get_int("track-cover") self._surface=Gdk.cairo_surface_create_from_pixbuf(self._pixbuf, 0, None)
self.set_size_request(size, size)
# connect # connect
self._client.emitter.connect("current_song", self._refresh) self._client.emitter.connect("current_song", self._refresh)
self._client.emitter.connect("disconnected", self._on_disconnected) self._client.emitter.connect("disconnected", self._on_disconnected)
self._client.emitter.connect("reconnected", self._on_reconnected) self._client.emitter.connect("reconnected", self._on_reconnected)
self._settings.connect("changed::track-cover", self._on_settings_changed)
def _clear(self): def _clear(self):
size=self._settings.get_int("track-cover") self._pixbuf=GdkPixbuf.Pixbuf.new_from_file(FALLBACK_COVER)
self.set_from_pixbuf(GdkPixbuf.Pixbuf.new_from_file_at_size(FALLBACK_COVER, size, size)) self._surface=Gdk.cairo_surface_create_from_pixbuf(self._pixbuf, 0, None)
self.queue_draw()
def _refresh(self, *args): def _refresh(self, *args):
if self._client.current_cover is None: if self._client.current_cover is None:
self._clear() self._clear()
else: else:
self.set_from_pixbuf(self._client.current_cover.get_pixbuf(self._settings.get_int("track-cover"))) self._pixbuf=self._client.current_cover.get_pixbuf()
self._surface=Gdk.cairo_surface_create_from_pixbuf(self._pixbuf, 0, None)
self.queue_draw()
def _on_disconnected(self, *args): def _on_disconnected(self, *args):
self.set_sensitive(False) self.set_sensitive(False)
@ -2904,10 +2906,16 @@ class MainCover(Gtk.Image):
def _on_reconnected(self, *args): def _on_reconnected(self, *args):
self.set_sensitive(True) self.set_sensitive(True)
def _on_settings_changed(self, *args): def do_draw(self, context):
size=self._settings.get_int("track-cover") height_factor=self.get_allocated_height()/self._pixbuf.get_height()
self.set_size_request(size, size) width_factor=self.get_allocated_width()/self._pixbuf.get_width()
self._refresh() if height_factor < width_factor:
context.scale(height_factor, height_factor)
context.set_source_surface(self._surface, ((self.get_allocated_width()/height_factor)-self._pixbuf.get_width())/2, 0)
else:
context.scale(width_factor, width_factor)
context.set_source_surface(self._surface, 0, ((self.get_allocated_height()/width_factor)-self._pixbuf.get_height())/2)
context.paint()
class CoverLyricsWindow(Gtk.Overlay): class CoverLyricsWindow(Gtk.Overlay):
def __init__(self, client, settings): def __init__(self, client, settings):
@ -3644,10 +3652,10 @@ class MainWindow(Gtk.ApplicationWindow):
idle_add(callback) idle_add(callback)
def _mini_player(self, *args): def _mini_player(self, *args):
if self.is_maximized():
self.unmaximize()
if self._settings.get_boolean("mini-player"): if self._settings.get_boolean("mini-player"):
if self.is_maximized(): self.resize(self._settings.get_int("mini-player-width"), self._settings.get_int("mini-player-height"))
self.unmaximize()
self.resize(1,1)
else: else:
self.resize(self._settings.get_int("width"), self._settings.get_int("height")) self.resize(self._settings.get_int("width"), self._settings.get_int("height"))
self.show_all() self.show_all()
@ -3751,10 +3759,14 @@ class MainWindow(Gtk.ApplicationWindow):
self._search_button.set_sensitive(False) self._search_button.set_sensitive(False)
def _on_size_allocate(self, widget, rect): def _on_size_allocate(self, widget, rect):
if not self.is_maximized() and not self._settings.get_boolean("mini-player"): if not self.is_maximized():
if (size:=self.get_size()) != self._size: # prevent unneeded write operations if (size:=self.get_size()) != self._size: # prevent unneeded write operations
self._settings.set_int("width", size[0]) if self._settings.get_boolean("mini-player"):
self._settings.set_int("height", size[1]) self._settings.set_int("mini-player-width", size[0])
self._settings.set_int("mini-player-height", size[1])
else:
self._settings.set_int("width", size[0])
self._settings.set_int("height", size[1])
self._size=size self._size=size
def _on_cursor_watch(self, obj, typestring): def _on_cursor_watch(self, obj, typestring):