ChooserButtonWidgets: Fix button and menu images in hidpi.

gtk button: the button image was never being upscaled from its
natural size, since the image was 35px and set_picture_from_file
only scaled it if the image exceeded that size.

icon button: Same as gtk - 48px was being requested and 48 was
returned, but it was requesting an unscaled asset (not 48@2x).

The cinnamon and pointer thumbnails are larger than the size we
want so they were being scaled.

None of the menu content was being scaled at all.

Simplified image loading a bit also.

Author: mtwebster

files/usr/share/cinnamon/cinnamon-settings/bin/ChooserButtonWidgets.py

@@ -113,40 +113,26 @@ def reset_loading_progress(self):
         self.progress = 0.0
         self.queue_draw()
 
-    def set_picture_from_file (self, path):
-        pixbuf = None
-        message = ""
-
-        if os.path.exists(path):
-            try:
-                pixbuf = GdkPixbuf.Pixbuf.new_from_file(path)
-            except GLib.Error as e:
-                message = "Could not load pixbuf from '%s': %s" % (path, e.message)
-                error = True
-
-            if pixbuf is not None:
-                h = pixbuf.get_height()
-                w = pixbuf.get_width()
-
-                if self.keep_square and (h > self.button_picture_size or w > self.button_picture_size):
-                    try:
-                        pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size(path, self.button_picture_size * self.scale, self.button_picture_size * self.scale)
-                    except GLib.Error as e:
-                        message = "Could not scale pixbuf from '%s': %s" % (path, e.message)
-                        error = True
-                elif h > self.button_picture_size:
-                    try:
-                        pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size(path, -1, self.button_picture_size * self.scale)
-                    except GLib.Error as e:
-                        message = "Could not scale pixbuf from '%s': %s" % (path, e.message)
-                        error = True
+    def create_scaled_surface(self, path):
+        w = -1 if not self.keep_square else self.button_picture_size * self.scale
+        h = self.button_picture_size * self.scale
+
+        try:
+            pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size(path, w, h)
+        except GLib.Error as e:
+            print("Could not load thumbnail file '%s': %s" % (path, e.message))
 
         if pixbuf:
-            surface = Gdk.cairo_surface_create_from_pixbuf(pixbuf, self.scale)
+            return Gdk.cairo_surface_create_from_pixbuf(pixbuf, self.scale)
+        else:
+            return None
+
+    def set_picture_from_file (self, path):
+        surface = self.create_scaled_surface(path)
+        if surface:
             self.button_image.set_from_surface(surface)
         else:
-            print(message)
-            self.set_picture_from_file("/usr/share/cinnamon/faces/user-generic.png")
+            self.button_image.set_from_icon_name("user-generic", Gtk.IconSize.BUTTON)
 
     def set_button_label(self, label):
         self.button_label.set_markup(label)
@@ -168,51 +154,34 @@ def clear_menu(self):
         menu.destroy()
 
     def add_picture(self, path, callback, title=None, id=None):
-        pixbuf = None
-        if os.path.exists(path):
-            try:
-                pixbuf = GdkPixbuf.Pixbuf.new_from_file(path)
-            except GLib.Error as e:
-                message = "Could not load pixbuf from '%s': %s" % (path, e.message)
-                error = True
-
-            if pixbuf is not None:
-                h = pixbuf.get_height()
-                w = pixbuf.get_width()
-
-                try:
-                    if self.menu_pictures_size is None:
-                        pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size(path, w, h)
-                    else:
-                        pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size(path, -1, self.menu_pictures_size)
-                except GLib.Error as e:
-                    print('Caught GLib.Error exception: {}\npath: {}'.format(e, str(path)))
-
-                if pixbuf is None:
-                    return
-
-                surface = Gdk.cairo_surface_create_from_pixbuf(pixbuf, self.scale)
-                image = Gtk.Image()
-                image.set_size_request(self.menu_pictures_size / self.scale, self.menu_pictures_size / self.scale)
-                image.set_from_surface(surface)
-                menuitem = Gtk.MenuItem()
-                if title is not None:
-                    vbox = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=2)
-                    vbox.add(image)
-                    label = Gtk.Label()
-                    label.set_text(title)
-                    vbox.add(label)
-                    menuitem.add(vbox)
-                else:
-                    menuitem.add(image)
-                if id is not None:
-                    menuitem.connect('activate', self._on_picture_selected, path, callback, id)
-                else:
-                    menuitem.connect('activate', self._on_picture_selected, path, callback)
-                self.menu.attach(menuitem, self.col, self.col+1, self.row, self.row+1)
-                self.col = (self.col+1) % self.num_cols
-                if self.col == 0:
-                    self.row = self.row + 1
+        image = Gtk.Image()
+        image.set_size_request(-1, self.menu_pictures_size / self.scale)
+
+        surface = self.create_scaled_surface(path)
+
+        if surface:
+            image.set_from_surface(surface)
+        else:
+            image.set_from_icon_name("user-generic", Gtk.IconSize.BUTTON)
+
+        menuitem = Gtk.MenuItem()
+        if title is not None:
+            vbox = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=2)
+            vbox.add(image)
+            label = Gtk.Label()
+            label.set_text(title)
+            vbox.add(label)
+            menuitem.add(vbox)
+        else:
+            menuitem.add(image)
+        if id is not None:
+            menuitem.connect('activate', self._on_picture_selected, path, callback, id)
+        else:
+            menuitem.connect('activate', self._on_picture_selected, path, callback)
+        self.menu.attach(menuitem, self.col, self.col+1, self.row, self.row+1)
+        self.col = (self.col+1) % self.num_cols
+        if self.col == 0:
+            self.row = self.row + 1
 
     def add_separator(self):
         self.row = self.row + 1

files/usr/share/cinnamon/cinnamon-settings/modules/cs_themes.py

@@ -313,7 +313,7 @@ def create_button_chooser(self, settings, key, path_prefix, path_suffix, button_
             chooser.set_picture_from_file("/usr/share/cinnamon/theme/thumbnail.png")
         elif path_suffix == "icons":
             current_theme = Gtk.IconTheme.get_default()
-            folder = current_theme.lookup_icon("folder", button_picture_size, 0)
+            folder = current_theme.lookup_icon_for_scale("folder", button_picture_size, self.window.get_scale_factor(), 0)
             if folder is not None:
                 path = folder.get_filename()
                 chooser.set_picture_from_file(path)