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

Add partial implementation of dynamic width/height layout to TidyGrid

Browse Source 
This is not a complete patch; it doesn't attempt to handle the homogenous
property or column major.

(Based on patch by Colin Walters <walters@verbum.org>)

http://bugzilla.gnome.org/show_bug.cgi?id=587720
This commit is contained in:
Owen W. Taylor 2009-07-03 22:31:22 -04:00
parent a71ae65f8b
commit e9966b4aff
1 changed files with 59 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
src/tidy/tidy-grid.c
View File

@ -1,3 +1,5 @@
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
/* tidy-grid.h: Reflowing grid layout container for clutter. /* tidy-grid.h: Reflowing grid layout container for clutter.
* *
* Copyright (C) 2008 Intel Corporation * Copyright (C) 2008 Intel Corporation
@ -102,7 +104,6 @@ G_DEFINE_TYPE_WITH_CODE (TidyGrid, tidy_grid,
struct _TidyGridPrivate struct _TidyGridPrivate
{ {
gfloat for_height, for_width; gfloat for_height, for_width;
gfloat pref_width, pref_height;
gfloat alloc_width, alloc_height; gfloat alloc_width, alloc_height;
GHashTable *hash_table; GHashTable *hash_table;
@ -139,7 +140,6 @@ struct _TidyGridActorData
{ {
gboolean xpos_set, ypos_set; gboolean xpos_set, ypos_set;
gfloat xpos, ypos; gfloat xpos, ypos;
gfloat pref_width, pref_height;
}; };
static void static void
@ -666,15 +666,31 @@ tidy_grid_get_preferred_width (ClutterActor *self,
{ {
TidyGrid *layout = (TidyGrid *) self; TidyGrid *layout = (TidyGrid *) self;
TidyGridPrivate *priv = layout->priv; TidyGridPrivate *priv = layout->priv;
gfloat natural_width; GList *iter;
gfloat natural_width = 0;
gfloat min_width = 0;
for (iter = priv->list; iter; iter=iter->next)
{
ClutterActor *child = iter->data;
gfloat child_natural_w, child_natural_h;
gfloat child_min_w, child_min_h;
clutter_actor_get_preferred_size (child, &child_min_w, &child_min_h,
&child_natural_w, &child_natural_h);
if (child_min_w > min_width)
min_width = child_min_w;
natural_width += child_natural_w;
if (iter->next)
natural_width += priv->column_gap;
}
natural_width = 200.0;
if (min_width_p) if (min_width_p)
*min_width_p = natural_width; *min_width_p = min_width;
if (natural_width_p) if (natural_width_p)
*natural_width_p = natural_width; *natural_width_p = natural_width;
priv->pref_width = natural_width;
} }
static void static void
@ -685,12 +701,42 @@ tidy_grid_get_preferred_height (ClutterActor *self,
{ {
TidyGrid *layout = (TidyGrid *) self; TidyGrid *layout = (TidyGrid *) self;
TidyGridPrivate *priv = layout->priv; TidyGridPrivate *priv = layout->priv;
gfloat current_natural_width;
gfloat row_height;
gfloat natural_height; gfloat natural_height;
GList *iter;
natural_height = 200.0; current_natural_width = 0;
natural_height = 0;
row_height = 0;
for (iter = priv->list; iter; iter=iter->next)
{
ClutterActor *child = iter->data;
gfloat child_natural_w, child_natural_h;
priv->for_width = for_width; clutter_actor_get_preferred_size (child, NULL, NULL,
priv->pref_height = natural_height; &child_natural_w, &child_natural_h);
if (iter == priv->list)
{
current_natural_width = child_natural_w;
}
else if ((current_natural_width + child_natural_w) > for_width)
{
natural_height += row_height + priv->row_gap;
current_natural_width = child_natural_w;
row_height = child_natural_h;
}
else
{
current_natural_width += priv->column_gap + child_natural_w;
}
if (child_natural_h > row_height)
row_height = child_natural_h;
}
natural_height += row_height;
if (min_height_p) if (min_height_p)
*min_height_p = natural_height; *min_height_p = natural_height;
@ -758,9 +804,6 @@ compute_row_height (GList *siblings,
return best_yet; return best_yet;
} }
static gfloat static gfloat
compute_row_start (GList *siblings, compute_row_start (GList *siblings,
gfloat start_x, gfloat start_x,