From 2c17c186b8cd14592bb05e2ce4e4013ffbc63995 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Wed, 27 Feb 2019 03:31:19 +0100 Subject: [PATCH] st-texture-cache: Load sliced contents with REQUEST_CONTENTENT_SIZE When loading an actor for a sliced image actor, we can now use the REQUEST_CONTENT_SIZE request-mode for the actor since we the content image has now a predictable size and thus we can be sure that the size will be applied taking care of the resource scale. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/5 --- src/st/st-texture-cache.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/st/st-texture-cache.c b/src/st/st-texture-cache.c index b84f3ffdc..90b85d0bd 100644 --- a/src/st/st-texture-cache.c +++ b/src/st/st-texture-cache.c @@ -1014,13 +1014,12 @@ load_from_pixbuf (GdkPixbuf *pixbuf, { g_autoptr(ClutterContent) image = NULL; ClutterActor *actor; - int width = gdk_pixbuf_get_width (pixbuf); - int height = gdk_pixbuf_get_height (pixbuf); image = pixbuf_to_st_content_image (pixbuf, -1, -1, paint_scale, resource_scale); - actor = clutter_actor_new (); - clutter_actor_set_size (actor, width, height); + actor = g_object_new (CLUTTER_TYPE_ACTOR, + "request-mode", CLUTTER_REQUEST_CONTENT_SIZE, + NULL); clutter_actor_set_content (actor, image); return actor;