From 59e276a830f3828fae3faf5b16f24a5de527dfa4 Mon Sep 17 00:00:00 2001 From: coderkun Date: Sat, 1 Sep 2018 18:49:16 +0200 Subject: [PATCH 1/2] Fix calculation of marks for library grid scale (close #55) --- mcg/widgets.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mcg/widgets.py b/mcg/widgets.py index 88278ce..1008242 100644 --- a/mcg/widgets.py +++ b/mcg/widgets.py @@ -1514,7 +1514,7 @@ class LibraryPanel(GObject.GObject): return self._allocation = new_allocation self._grid_scale.clear_marks() - width = widget.get_allocation().width - 12 + width = widget.get_allocation().width lower = int(self._grid_adjustment.get_lower()) upper = int(self._grid_adjustment.get_upper()) @@ -1522,7 +1522,7 @@ class LibraryPanel(GObject.GObject): countMax = max(int(width / lower), 1) for index in range(countMin, countMax): pixel = int(width / index) - pixel = pixel - int(pixel / 100) + pixel = pixel - (2 * int(pixel / 100)) self._grid_scale.add_mark( pixel, Gtk.PositionType.BOTTOM, @@ -1546,13 +1546,13 @@ class LibraryPanel(GObject.GObject): def on_grid_scale_change(self, widget, scroll, value): - size = round(value) + size = math.floor(value) range = self._grid_scale.get_adjustment() if size < range.get_lower() or size > range.get_upper(): return self._item_size = size - GObject.idle_add(self._set_widget_grid_size, self._library_grid, size, True) GObject.idle_add(self._library_grid.set_item_padding, size / 100) + GObject.idle_add(self._set_widget_grid_size, self._library_grid, size, True) def on_grid_scale_changed(self, widget, event): From bb4bf89079c4e1a95f8d629e54fec88cb35aaef3 Mon Sep 17 00:00:00 2001 From: coderkun Date: Sat, 1 Sep 2018 18:52:56 +0200 Subject: [PATCH 2/2] Bump version to 1.3.4 --- data/gtk.glade | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/gtk.glade b/data/gtk.glade index f0c6db1..9147c98 100644 --- a/data/gtk.glade +++ b/data/gtk.glade @@ -1434,7 +1434,7 @@ center appwindow CoverGrid - 1.3.3 + 1.3.4 CoverGrid is a client for the Music Player Daemon, focusing on albums instead of single tracks. http://www.suruatoel.xyz/codes/mcg mcg.svg diff --git a/setup.py b/setup.py index bf763bd..5c92b2e 100644 --- a/setup.py +++ b/setup.py @@ -53,7 +53,7 @@ setup( 'build_py': build_mcg }, name = "mcg", - version = '1.3.3', + version = '1.3.4', description = "CoverGrid (mcg) is a client for the Music Player Daemon, focusing on albums instead of single tracks.", url = "http://www.suruatoel.xyz/codes/mcg", author = "coderkun",