summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippo Argiolas <filippo.argiolas@gmail.com>2009-04-25 21:40:39 +0200
committerFilippo Argiolas <filippo.argiolas@gmail.com>2009-04-25 23:10:08 +0200
commitf81021d143a3f38389f7b5f0279c141bb779a367 (patch)
treec8e609d71d48199477eb3703834be1212a72fdf8
parentae5220c8902a35d21850927f5e1e3648ad98a06d (diff)
Reindent cheese-grid
-rw-r--r--src/cheese-grid.c104
1 files changed, 52 insertions, 52 deletions
diff --git a/src/cheese-grid.c b/src/cheese-grid.c
index a979de9..82c4e40 100644
--- a/src/cheese-grid.c
+++ b/src/cheese-grid.c
@@ -29,23 +29,23 @@ typedef struct _CheeseGridActorData CheeseGridActorData;
static void cheese_grid_dispose (GObject *object);
static void cheese_grid_finalize (GObject *object);
- static void cheese_grid_finalize (GObject *object);
+static void cheese_grid_finalize (GObject *object);
static void clutter_container_iface_init (ClutterContainerIface *iface);
static void cheese_grid_real_add (ClutterContainer *container,
- ClutterActor *actor);
+ ClutterActor *actor);
static void cheese_grid_real_remove (ClutterContainer *container,
- ClutterActor *actor);
+ ClutterActor *actor);
static void cheese_grid_real_foreach (ClutterContainer *container,
- ClutterCallback callback,
- gpointer user_data);
+ ClutterCallback callback,
+ gpointer user_data);
static void cheese_grid_real_raise (ClutterContainer *container,
- ClutterActor *actor,
- ClutterActor *sibling);
+ ClutterActor *actor,
+ ClutterActor *sibling);
static void cheese_grid_real_lower (ClutterContainer *container,
- ClutterActor *actor,
- ClutterActor *sibling);
+ ClutterActor *actor,
+ ClutterActor *sibling);
static void
cheese_grid_real_sort_depth_order (ClutterContainer *container);
@@ -55,31 +55,31 @@ cheese_grid_free_actor_data (gpointer data);
static void cheese_grid_paint (ClutterActor *actor);
static void cheese_grid_pick (ClutterActor *actor,
- const ClutterColor *color);
+ const ClutterColor *color);
static void
cheese_grid_get_preferred_width (ClutterActor *self,
- ClutterUnit for_height,
- ClutterUnit *min_width_p,
- ClutterUnit *natural_width_p);
+ ClutterUnit for_height,
+ ClutterUnit *min_width_p,
+ ClutterUnit *natural_width_p);
static void
cheese_grid_get_preferred_height (ClutterActor *self,
- ClutterUnit for_width,
- ClutterUnit *min_height_p,
- ClutterUnit *natural_height_p);
+ ClutterUnit for_width,
+ ClutterUnit *min_height_p,
+ ClutterUnit *natural_height_p);
static void cheese_grid_allocate (ClutterActor *self,
- const ClutterActorBox *box,
- gboolean absolute_origin_changed);
+ const ClutterActorBox *box,
+ gboolean absolute_origin_changed);
G_DEFINE_TYPE_WITH_CODE (CheeseGrid, cheese_grid,
CLUTTER_TYPE_ACTOR,
G_IMPLEMENT_INTERFACE (CLUTTER_TYPE_CONTAINER,
clutter_container_iface_init));
-#define CHEESE_GRID_GET_PRIVATE(obj) \
- (G_TYPE_INSTANCE_GET_PRIVATE ((obj), CHEESE_TYPE_GRID, \
+#define CHEESE_GRID_GET_PRIVATE(obj) \
+ (G_TYPE_INSTANCE_GET_PRIVATE ((obj), CHEESE_TYPE_GRID, \
CheeseGridPrivate))
struct _CheeseGridPrivate
@@ -199,7 +199,7 @@ cheese_grid_new (void)
static void
cheese_grid_real_add (ClutterContainer *container,
- ClutterActor *actor)
+ ClutterActor *actor)
{
CheeseGridPrivate *priv;
CheeseGridActorData *data;
@@ -226,7 +226,7 @@ cheese_grid_real_add (ClutterContainer *container,
static void
cheese_grid_real_remove (ClutterContainer *container,
- ClutterActor *actor)
+ ClutterActor *actor)
{
CheeseGrid *layout = CHEESE_GRID (container);
CheeseGridPrivate *priv = layout->priv;
@@ -234,16 +234,16 @@ cheese_grid_real_remove (ClutterContainer *container,
g_object_ref (actor);
if (g_hash_table_remove (priv->hash_table, actor))
- {
- clutter_actor_unparent (actor);
+ {
+ clutter_actor_unparent (actor);
- clutter_actor_queue_relayout (CLUTTER_ACTOR (layout));
+ clutter_actor_queue_relayout (CLUTTER_ACTOR (layout));
- g_signal_emit_by_name (container, "actor-removed", actor);
+ g_signal_emit_by_name (container, "actor-removed", actor);
- if (CLUTTER_ACTOR_IS_VISIBLE (CLUTTER_ACTOR (layout)))
- clutter_actor_queue_redraw (CLUTTER_ACTOR (layout));
- }
+ if (CLUTTER_ACTOR_IS_VISIBLE (CLUTTER_ACTOR (layout)))
+ clutter_actor_queue_redraw (CLUTTER_ACTOR (layout));
+ }
priv->list = g_list_remove (priv->list, actor);
g_object_unref (actor);
@@ -251,8 +251,8 @@ cheese_grid_real_remove (ClutterContainer *container,
static void
cheese_grid_real_foreach (ClutterContainer *container,
- ClutterCallback callback,
- gpointer user_data)
+ ClutterCallback callback,
+ gpointer user_data)
{
CheeseGrid *layout = CHEESE_GRID (container);
CheeseGridPrivate *priv = layout->priv;
@@ -262,16 +262,16 @@ cheese_grid_real_foreach (ClutterContainer *container,
static void
cheese_grid_real_raise (ClutterContainer *container,
- ClutterActor *actor,
- ClutterActor *sibling)
+ ClutterActor *actor,
+ ClutterActor *sibling)
{
/* STUB */
}
static void
cheese_grid_real_lower (ClutterContainer *container,
- ClutterActor *actor,
- ClutterActor *sibling)
+ ClutterActor *actor,
+ ClutterActor *sibling)
{
/* STUB */
}
@@ -292,20 +292,20 @@ cheese_grid_paint (ClutterActor *actor)
for (child_item = priv->list;
child_item != NULL;
child_item = child_item->next)
- {
- ClutterActor *child = child_item->data;
+ {
+ ClutterActor *child = child_item->data;
- g_assert (child != NULL);
+ g_assert (child != NULL);
- if (CLUTTER_ACTOR_IS_VISIBLE (child))
- clutter_actor_paint (child);
- }
+ if (CLUTTER_ACTOR_IS_VISIBLE (child))
+ clutter_actor_paint (child);
+ }
}
static void
cheese_grid_pick (ClutterActor *actor,
- const ClutterColor *color)
+ const ClutterColor *color)
{
/* Chain up so we get a bounding box pained (if we are reactive) */
CLUTTER_ACTOR_CLASS (cheese_grid_parent_class)->pick (actor, color);
@@ -314,14 +314,14 @@ cheese_grid_pick (ClutterActor *actor,
* the child actors also getting 'picked'.
*/
if (CLUTTER_ACTOR_IS_VISIBLE (actor))
- cheese_grid_paint (actor);
+ cheese_grid_paint (actor);
}
static void
cheese_grid_get_preferred_width (ClutterActor *self,
- ClutterUnit for_height,
- ClutterUnit *min_width_p,
- ClutterUnit *natural_width_p)
+ ClutterUnit for_height,
+ ClutterUnit *min_width_p,
+ ClutterUnit *natural_width_p)
{
CheeseGrid *layout = (CheeseGrid *) self;
CheeseGridPrivate *priv = layout->priv;
@@ -329,7 +329,7 @@ cheese_grid_get_preferred_width (ClutterActor *self,
ClutterActor *parent = clutter_actor_get_parent (self);
// natural_width = clutter_actor_get_width (parent);
- natural_width = CLUTTER_UNITS_FROM_INT (200);
+ natural_width = CLUTTER_UNITS_FROM_INT (600);
if (min_width_p)
*min_width_p = natural_width;
@@ -341,9 +341,9 @@ cheese_grid_get_preferred_width (ClutterActor *self,
static void
cheese_grid_get_preferred_height (ClutterActor *self,
- ClutterUnit for_width,
- ClutterUnit *min_height_p,
- ClutterUnit *natural_height_p)
+ ClutterUnit for_width,
+ ClutterUnit *min_height_p,
+ ClutterUnit *natural_height_p)
{
CheeseGrid *layout = (CheeseGrid *) self;
CheeseGridPrivate *priv = layout->priv;
@@ -364,8 +364,8 @@ cheese_grid_get_preferred_height (ClutterActor *self,
static void
cheese_grid_allocate (ClutterActor *self,
- const ClutterActorBox *box,
- gboolean absolute_origin_changed)
+ const ClutterActorBox *box,
+ gboolean absolute_origin_changed)
{
CheeseGrid *layout = (CheeseGrid *) self;
CheeseGridPrivate *priv = layout->priv;