isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-03-03 19:58:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename minimum and maximum depth properties of the depth behaviour

Browse Source 
To follow the other simple behaviours, the ClutterBehaviourDepth:min-depth
and ClutterBehaviourDepth:max-depth properties have been renamed to
ClutterBehaviourDepth:depth-start and ClutterBehaviourDepth:depth-end
respectively.
This commit is contained in:
Emmanuele Bassi 2007-07-13 14:11:49 +00:00
parent 410f40b578
commit 097c177824
2 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
clutter/clutter-behaviour-depth.c
View File

@ -50,16 +50,16 @@ G_DEFINE_TYPE (ClutterBehaviourDepth,
struct _ClutterBehaviourDepthPrivate struct _ClutterBehaviourDepthPrivate
{ {
gint min_depth; gint depth_start;
gint max_depth; gint depth_end;
}; };
enum enum
{ {
PROP_0, PROP_0,
PROP_MIN_DEPTH, PROP_DEPTH_START,
PROP_MAX_DEPTH PROP_DEPTH_END
}; };
static void static void
@ -79,14 +79,14 @@ clutter_behaviour_depth_alpha_notify (ClutterBehaviour *behaviour,
priv = CLUTTER_BEHAVIOUR_DEPTH (behaviour)->priv; priv = CLUTTER_BEHAVIOUR_DEPTH (behaviour)->priv;
if (priv->max_depth > priv->min_depth) if (priv->depth_end > priv->depth_start)
delta = priv->max_depth - priv->min_depth; delta = priv->depth_end - priv->depth_start;
else else
delta = priv->min_depth - priv->max_depth; delta = priv->depth_start - priv->depth_end;
depth = alpha_value * delta / CLUTTER_ALPHA_MAX_ALPHA; depth = alpha_value * delta / CLUTTER_ALPHA_MAX_ALPHA;
depth += ((priv->max_depth > priv->min_depth) ? priv->max_depth depth += ((priv->depth_end > priv->depth_start) ? priv->depth_start
: priv->min_depth); : priv->depth_end);
CLUTTER_NOTE (BEHAVIOUR, "alpha: %d, depth: %d", alpha_value, depth); CLUTTER_NOTE (BEHAVIOUR, "alpha: %d, depth: %d", alpha_value, depth);
@ -105,11 +105,11 @@ clutter_behaviour_depth_set_property (GObject *gobject,
switch (prop_id) switch (prop_id)
{ {
case PROP_MIN_DEPTH: case PROP_DEPTH_START:
depth->priv->min_depth = g_value_get_int (value); depth->priv->depth_start = g_value_get_int (value);
break; break;
case PROP_MAX_DEPTH: case PROP_DEPTH_END:
depth->priv->max_depth = g_value_get_int (value); depth->priv->depth_end = g_value_get_int (value);
break; break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
@ -127,11 +127,11 @@ clutter_behaviour_depth_get_property (GObject *gobject,
switch (prop_id) switch (prop_id)
{ {
case PROP_MIN_DEPTH: case PROP_DEPTH_START:
g_value_set_int (value, depth->priv->min_depth); g_value_set_int (value, depth->priv->depth_start);
break; break;
case PROP_MAX_DEPTH: case PROP_DEPTH_END:
g_value_set_int (value, depth->priv->max_depth); g_value_set_int (value, depth->priv->depth_end);
break; break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
@ -153,29 +153,29 @@ clutter_behaviour_depth_class_init (ClutterBehaviourDepthClass *klass)
behaviour_class->alpha_notify = clutter_behaviour_depth_alpha_notify; behaviour_class->alpha_notify = clutter_behaviour_depth_alpha_notify;
/** /**
* ClutterBehaviourDepth:min-depth: * ClutterBehaviourDepth:depth-start:
* *
* Minimum depth level to apply to the actors. * Minimum depth level to apply to the actors.
* *
* Since: 0.4 * Since: 0.4
*/ */
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_MIN_DEPTH, PROP_DEPTH_START,
g_param_spec_int ("min-depth", g_param_spec_int ("depth-start",
"Minimum Depth", "Minimum Depth",
"Minimum depth to apply", "Minimum depth to apply",
G_MININT, G_MAXINT, 0, G_MININT, G_MAXINT, 0,
CLUTTER_PARAM_READWRITE)); CLUTTER_PARAM_READWRITE));
/** /**
* ClutterBehaviourDepth:max-depth: * ClutterBehaviourDepth:depth-end:
* *
* Maximum depth level to apply to the actors. * Maximum depth level to apply to the actors.
* *
* Since: 0.4 * Since: 0.4
*/ */
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_MAX_DEPTH, PROP_DEPTH_END,
g_param_spec_int ("max-depth", g_param_spec_int ("depth-end",
"Maximum Depth", "Maximum Depth",
"Maximum depth to apply", "Maximum depth to apply",
G_MININT, G_MAXINT, 0, G_MININT, G_MAXINT, 0,
@ -193,8 +193,8 @@ clutter_behaviour_depth_init (ClutterBehaviourDepth *depth)
/** /**
* clutter_behaviour_depth_new: * clutter_behaviour_depth_new:
* @alpha: a #ClutterAlpha or %NULL * @alpha: a #ClutterAlpha or %NULL
* @min_depth: minimum depth level * @depth_start: minimum depth level
* @max_depth: maximum depth level * @depth_end: maximum depth level
* *
* Creates a new #ClutterBehaviourDepth which can be used to control * Creates a new #ClutterBehaviourDepth which can be used to control
* the ClutterActor:depth property of a set of #ClutterActor<!-- -->s. * the ClutterActor:depth property of a set of #ClutterActor<!-- -->s.
@ -205,15 +205,15 @@ clutter_behaviour_depth_init (ClutterBehaviourDepth *depth)
*/ */
ClutterBehaviour * ClutterBehaviour *
clutter_behaviour_depth_new (ClutterAlpha *alpha, clutter_behaviour_depth_new (ClutterAlpha *alpha,
gint min_depth, gint depth_start,
gint max_depth) gint depth_end)
{ {
g_return_val_if_fail (alpha == NULL || CLUTTER_IS_ALPHA (alpha), NULL); g_return_val_if_fail (alpha == NULL || CLUTTER_IS_ALPHA (alpha), NULL);
return g_object_new (CLUTTER_TYPE_BEHAVIOUR_DEPTH, return g_object_new (CLUTTER_TYPE_BEHAVIOUR_DEPTH,
"alpha", alpha, "alpha", alpha,
"min-depth", min_depth, "depth-start", depth_start,
"max-depth", max_depth, "depth-end", depth_end,
NULL); NULL);
} }

4
clutter/clutter-behaviour-depth.h
View File

@ -59,8 +59,8 @@ struct _ClutterBehaviourDepthClass
GType clutter_behaviour_depth_get_type (void) G_GNUC_CONST; GType clutter_behaviour_depth_get_type (void) G_GNUC_CONST;
ClutterBehaviour *clutter_behaviour_depth_new (ClutterAlpha *alpha, ClutterBehaviour *clutter_behaviour_depth_new (ClutterAlpha *alpha,
gint min_depth, gint depth_start,
gint max_depth); gint depth_end);
G_END_DECLS G_END_DECLS