isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-09-20 06:25:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

grid: Use the orientation of the request

Browse Source 
We use the orientation of the grid to get the preferred size of the
layout, but we should be using the orientation of the request instead.
The preferred width has an orizontal orientation, and the preferred
height has a vertical orientation.

This allows us to refactor the get_preferred_* implementation into a
separate function.
This commit is contained in:
Emmanuele Bassi 2015-08-29 20:19:51 +01:00
parent ed80a4bebb
commit dea5057fbd
1 changed files with 41 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
clutter/clutter-grid-layout.c
View File

@ -1289,59 +1289,72 @@ clutter_grid_layout_set_container (ClutterLayoutManager *self,
}
static void
clutter_grid_layout_get_preferred_width (ClutterLayoutManager *self,
clutter_grid_layout_get_size_for_size (ClutterGridLayout *self,
ClutterOrientation orientation,
float size,
float *minimum,
float *natural)
{
ClutterGridRequest request;
ClutterGridLines *lines;
float min_size, nat_size;
request.grid = self;
clutter_grid_request_update_attach (&request);
clutter_grid_request_count_lines (&request);
lines = &request.lines[0];
lines->lines = g_newa (ClutterGridLine, lines->max - lines->min);
memset (lines->lines, 0, (lines->max - lines->min) * sizeof (ClutterGridLine));
lines = &request.lines[1];
lines->lines = g_newa (ClutterGridLine, lines->max - lines->min);
memset (lines->lines, 0, (lines->max - lines->min) * sizeof (ClutterGridLine));
clutter_grid_request_run (&request, 1 - orientation, FALSE);
clutter_grid_request_sum (&request, 1 - orientation, &min_size, &nat_size);
clutter_grid_request_allocate (&request, 1 - orientation, MAX (size, nat_size));
clutter_grid_request_run (&request, orientation, TRUE);
clutter_grid_request_sum (&request, orientation, minimum, natural);
}
static void
clutter_grid_layout_get_preferred_width (ClutterLayoutManager *manager,
ClutterContainer *container,
gfloat for_height,
gfloat *min_width_p,
gfloat *nat_width_p)
{
ClutterGridLayoutPrivate *priv = CLUTTER_GRID_LAYOUT (self)->priv;
ClutterGridRequest request;
ClutterGridLines *lines;
ClutterGridLayout *self = CLUTTER_GRID_LAYOUT (manager);
if (min_width_p)
*min_width_p = 0.0f;
if (nat_width_p)
*nat_width_p = 0.0f;
request.grid = CLUTTER_GRID_LAYOUT (self);
clutter_grid_request_update_attach (&request);
clutter_grid_request_count_lines (&request);
lines = &request.lines[priv->orientation];
lines->lines = g_newa (ClutterGridLine, lines->max - lines->min);
memset (lines->lines, 0, (lines->max - lines->min) * sizeof (ClutterGridLine));
clutter_grid_request_run (&request, priv->orientation, FALSE);
clutter_grid_request_sum (&request, priv->orientation,
min_width_p, nat_width_p);
clutter_grid_layout_get_size_for_size (self, CLUTTER_ORIENTATION_HORIZONTAL,
for_height,
min_width_p, nat_width_p);
}
static void
clutter_grid_layout_get_preferred_height (ClutterLayoutManager *self,
clutter_grid_layout_get_preferred_height (ClutterLayoutManager *manager,
ClutterContainer *container,
gfloat for_width,
gfloat *min_height_p,
gfloat *nat_height_p)
{
ClutterGridLayoutPrivate *priv = CLUTTER_GRID_LAYOUT (self)->priv;
ClutterGridRequest request;
ClutterGridLines *lines;
ClutterGridLayout *self = CLUTTER_GRID_LAYOUT (manager);
if (min_height_p)
*min_height_p = 0.0f;
if (nat_height_p)
*nat_height_p = 0.0f;
request.grid = CLUTTER_GRID_LAYOUT (self);
clutter_grid_request_update_attach (&request);
clutter_grid_request_count_lines (&request);
lines = &request.lines[priv->orientation];
lines->lines = g_newa (ClutterGridLine, lines->max - lines->min);
memset (lines->lines, 0, (lines->max - lines->min) * sizeof (ClutterGridLine));
clutter_grid_request_run (&request, priv->orientation, FALSE);
clutter_grid_request_sum (&request, priv->orientation,
min_height_p, nat_height_p);
clutter_grid_layout_get_size_for_size (self, CLUTTER_ORIENTATION_VERTICAL,
for_width,
min_height_p, nat_height_p);
}
static void