From 106a071ebf0ef7dcabf1328fa70adb6c7ec91b3b Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 27 Feb 2019 14:40:27 +1000 Subject: [PATCH] resolutionrow: resolutions are now a 1- or 2-length tuple Signed-off-by: Peter Hutterer --- piper/resolutionrow.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/piper/resolutionrow.py b/piper/resolutionrow.py index 01d93fb..fd2d146 100644 --- a/piper/resolutionrow.py +++ b/piper/resolutionrow.py @@ -59,7 +59,7 @@ class ResolutionRow(Gtk.ListBoxRow): self._active_handler = resolution.connect("notify::is-active", self._on_is_active_changed) - xres, __ = resolution.resolution + xres = resolution.resolution[0] minres = resolution.resolutions[0] maxres = resolution.resolutions[-1] self.resolutions = resolution.resolutions @@ -116,12 +116,15 @@ class ResolutionRow(Gtk.ListBoxRow): # Freeze the notify::resolution signal from firing to prevent Piper from # ending up in an infinite update loop. with self._resolution.handler_block(self._resolution_handler): - self._resolution.resolution = xres, xres + if len(self._resolution.resolution) == 1: + self._resolution.resolution = (xres, ) + else: + self._resolution.resolution = (xres, xres) self.dpi_label.set_text("{} DPI".format(xres)) def _on_resolution_changed(self, resolution, pspec): # RatbagdResolution's resolution has changed, update the scales. - xres, __ = resolution.resolution + xres = resolution.resolution[0] self.scale.set_value(xres) def _on_is_active_changed(self, resolution, pspec):