theme.c: Fix window control hidpi rendering for all themes.

By scaling the pixbuf when loading, existing assets can be used.

1 files changed, 15 insertions, 3 deletions

diff --git a/src/ui/theme.c b/src/ui/theme.c
index d277b687..35ef80eb 100644
--- a/src/ui/theme.c
+++ b/src/ui/theme.c
@@ -4136,8 +4136,8 @@ meta_draw_op_draw_with_env (const MetaDrawOp    *op,
 
         if (op->data.image.pixbuf)
           {
-            env->object_width = gdk_pixbuf_get_width (op->data.image.pixbuf);
-            env->object_height = gdk_pixbuf_get_height (op->data.image.pixbuf);
+            env->object_width = gdk_pixbuf_get_width (op->data.image.pixbuf) / scale;
+            env->object_height = gdk_pixbuf_get_height (op->data.image.pixbuf) / scale;
           }
 
         rwidth = parse_size_unchecked (op->data.image.width, env) * scale;
@@ -5674,7 +5674,19 @@ meta_theme_load_image (MetaTheme  *theme,
           char *full_path;
           full_path = g_build_filename (theme->dirname, filename, NULL);
 
-          pixbuf = gdk_pixbuf_new_from_file (full_path, error);
+          gint width, height;
+
+          if (gdk_pixbuf_get_file_info (full_path, &width, &height) == NULL)
+            {
+              g_free (full_path);
+              return NULL;
+            }
+
+          width *= scale;
+          height *= scale;
+
+          pixbuf = gdk_pixbuf_new_from_file_at_size (full_path, width, height, error);
+
           if (pixbuf == NULL)
             {
               g_free (full_path);