brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clutter/box-layout: Don't cast children sizes to integers

Browse Source 
The distribute_natural_allocation() function was copied over from Gtk to
Clutter 11 years ago with commit e636a0bbce.
Gtk only supports integers sizes in its layout machinery, while Clutter
does everything using floats.

Since this function sets the minimum_size (the size we allocate the
children in the end) to an integer, this means we're implicitly
typecasting floats to integers here, effectively floor()'ing all sizes
that we allocate the box children.

A bug this caused in gnome-shell was that a scrollView (like the one in
the endSessionDialog) was showing scrollbars even though the content
perfectly fit inside the view: Say the content and its scrollView parent
request a size of 63.9 px, but get allocated a size of 63 px by a box
layout. Now the scrollView notices that its allocated size is smaller
than the requested size and thus shows a scrollbar.

So fix that and use floats in distribute_natural_allocation() instead of
integers, as we do everywhere else in the layout machinery.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2284>
This commit is contained in:
Jonas Dreßler 2022-02-13 21:46:14 +01:00 committed by Marge Bot
parent 7bf10de538
commit abecf557bf
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
clutter/clutter/clutter-box-layout.c
View File

@ -596,17 +596,17 @@ distribute_natural_allocation (float extra_space,
/* Distribute available space. /* Distribute available space.
* This master piece of a loop was conceived by Behdad Esfahbod. * This master piece of a loop was conceived by Behdad Esfahbod.
*/ */
for (i = n_requested_sizes - 1; extra_space > 0 && i >= 0; --i) for (i = n_requested_sizes - 1; extra_space > 0.0 && i >= 0; --i)
{ {
/* Divide remaining space by number of remaining children. /* Divide remaining space by number of remaining children.
* Sort order and reducing remaining space by assigned space * Sort order and reducing remaining space by assigned space
* ensures that space is distributed equally. * ensures that space is distributed equally.
*/ */
int glue = (extra_space + i) / (i + 1); float glue = (extra_space + i) / (i + 1.0);
int gap = sizes[(spreading[i])].natural_size float gap =
- sizes[(spreading[i])].minimum_size; sizes[(spreading[i])].natural_size - sizes[(spreading[i])].minimum_size;
int extra = MIN (glue, gap); float extra = MIN (glue, gap);
sizes[spreading[i]].minimum_size += extra; sizes[spreading[i]].minimum_size += extra;