isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

st/texture-cache: Set up sliced images to fill parent

Browse Source 
When using fractional scaling, the size of the loaded image with
applied scaling may still differ from the displayed size. This
is currently addressed by syncing the size of all slice actors
in the (probably only) caller.

Instead, set the actors to fill their parent automatically.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2798>
This commit is contained in:
Florian Müllner 2023-06-09 19:52:15 +02:00 committed by Marge Bot
parent 5bf61d4cad
commit ebbcc31fbd
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/st/st-texture-cache.c
View File

@ -1321,6 +1321,12 @@ on_sliced_image_loaded (GObject *source_object,
if (g_task_had_error (task) || g_cancellable_is_cancelled (data->cancellable)) if (g_task_had_error (task) || g_cancellable_is_cancelled (data->cancellable))
return; return;
clutter_actor_set_layout_manager (data->actor,
g_object_new (CLUTTER_TYPE_BIN_LAYOUT, NULL));
/* stop propagation of child expand flags */
clutter_actor_set_x_expand (data->actor, FALSE);
clutter_actor_set_y_expand (data->actor, FALSE);
pixbufs = g_task_propagate_pointer (task, NULL); pixbufs = g_task_propagate_pointer (task, NULL);
for (list = pixbufs; list; list = list->next) for (list = pixbufs; list; list = list->next)
@ -1328,6 +1334,10 @@ on_sliced_image_loaded (GObject *source_object,
ClutterActor *actor = load_from_pixbuf (GDK_PIXBUF (list->data), ClutterActor *actor = load_from_pixbuf (GDK_PIXBUF (list->data),
data->paint_scale, data->paint_scale,
data->resource_scale); data->resource_scale);
clutter_actor_set_x_expand (actor, TRUE);
clutter_actor_set_y_expand (actor, TRUE);
clutter_actor_set_x_align (actor, CLUTTER_ACTOR_ALIGN_FILL);
clutter_actor_set_y_align (actor, CLUTTER_ACTOR_ALIGN_FILL);
clutter_actor_hide (actor); clutter_actor_hide (actor);
clutter_actor_add_child (data->actor, actor); clutter_actor_add_child (data->actor, actor);
} }