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

st: Adapt for ClutterContainer removal

Browse Source 
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3014>
This commit is contained in:
Zander Brown 2023-11-09 15:45:00 +00:00
parent f9ee0c9e45
commit ab7ed393cb
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/st/st-viewport.c
View File

@ -283,10 +283,10 @@ st_viewport_allocate (ClutterActor *actor,
st_theme_node_get_content_box (theme_node, box, &viewport_box);
clutter_actor_box_get_size (&viewport_box, &avail_width, &avail_height);
clutter_layout_manager_get_preferred_width (layout, CLUTTER_CONTAINER (actor),
clutter_layout_manager_get_preferred_width (layout, actor,
avail_height,
&min_width, &natural_width);
clutter_layout_manager_get_preferred_height (layout, CLUTTER_CONTAINER (actor),
clutter_layout_manager_get_preferred_height (layout, actor,
MAX (avail_width, min_width),
&min_height, &natural_height);
@ -302,8 +302,7 @@ st_viewport_allocate (ClutterActor *actor,
if (priv->vadjustment)
content_box.y2 += MAX (0, min_height - avail_height);
clutter_layout_manager_allocate (layout, CLUTTER_CONTAINER (actor),
&content_box);
clutter_layout_manager_allocate (layout, actor, &content_box);
/* update adjustments for scrolling */
if (priv->vadjustment)

2
src/st/st-widget.c
View File

@ -405,7 +405,7 @@ st_widget_allocate (ClutterActor *actor,
/* If we've chained up to here, we want to allocate the children using the
* currently installed layout manager */
clutter_layout_manager_allocate (clutter_actor_get_layout_manager (actor),
CLUTTER_CONTAINER (actor),
actor,
&content_box);
}