mirror of
https://github.com/brl/mutter.git
synced 2024-11-23 00:20:42 -05:00
clutter/actor: Correct color space accessor annotations
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3375>
This commit is contained in:
parent
9610665ab8
commit
9018432b0d
@ -6895,7 +6895,8 @@ clutter_actor_class_init (ClutterActorClass *klass)
|
|||||||
g_param_spec_object ("color-state", NULL, NULL,
|
g_param_spec_object ("color-state", NULL, NULL,
|
||||||
CLUTTER_TYPE_COLOR_STATE,
|
CLUTTER_TYPE_COLOR_STATE,
|
||||||
CLUTTER_PARAM_READWRITE |
|
CLUTTER_PARAM_READWRITE |
|
||||||
G_PARAM_CONSTRUCT);
|
G_PARAM_CONSTRUCT |
|
||||||
|
G_PARAM_EXPLICIT_NOTIFY);
|
||||||
|
|
||||||
g_object_class_install_properties (object_class, PROP_LAST, obj_props);
|
g_object_class_install_properties (object_class, PROP_LAST, obj_props);
|
||||||
|
|
||||||
@ -18403,31 +18404,26 @@ create_srgb_color_state (ClutterActor *self)
|
|||||||
/**
|
/**
|
||||||
* clutter_actor_set_color_state:
|
* clutter_actor_set_color_state:
|
||||||
* @self: a #ClutterActor
|
* @self: a #ClutterActor
|
||||||
* @color_state: a #ClutterColorState, or defaults to sRGB if %NULL
|
* @color_state: (nullable): a #ClutterColorState
|
||||||
*
|
*
|
||||||
* Attaches color state properties to [class@Actor]
|
* Set @self's color state to @color_state, or a default sRGB one if %NULL.
|
||||||
* default color state representing sRGB.
|
|
||||||
*/
|
*/
|
||||||
void
|
void
|
||||||
clutter_actor_set_color_state (ClutterActor *self,
|
clutter_actor_set_color_state (ClutterActor *self,
|
||||||
ClutterColorState *color_state)
|
ClutterColorState *color_state)
|
||||||
{
|
{
|
||||||
ClutterActorPrivate *priv;
|
ClutterActorPrivate *priv;
|
||||||
|
g_autoptr (ClutterColorState) srgb = NULL;
|
||||||
|
|
||||||
g_return_if_fail (CLUTTER_IS_ACTOR (self));
|
g_return_if_fail (CLUTTER_IS_ACTOR (self));
|
||||||
|
|
||||||
priv = self->priv;
|
priv = clutter_actor_get_instance_private (self);
|
||||||
|
|
||||||
if (!color_state)
|
if (!color_state)
|
||||||
color_state = create_srgb_color_state (self);
|
color_state = srgb = create_srgb_color_state (self);
|
||||||
else
|
|
||||||
g_object_ref (color_state);
|
|
||||||
|
|
||||||
g_set_object (&priv->color_state, color_state);
|
if (g_set_object (&priv->color_state, color_state))
|
||||||
|
g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_COLOR_STATE]);
|
||||||
g_object_unref (color_state);
|
|
||||||
|
|
||||||
g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_COLOR_STATE]);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -18437,15 +18433,18 @@ clutter_actor_set_color_state (ClutterActor *self,
|
|||||||
* Retrieves the color_state of a [class@Actor] set by
|
* Retrieves the color_state of a [class@Actor] set by
|
||||||
* [method@Actor.set_color_state].
|
* [method@Actor.set_color_state].
|
||||||
*
|
*
|
||||||
* Return value: (transfer full): a pointer to the #ClutterColorState
|
* Returns: (transfer none): the #ClutterColorState
|
||||||
* instance, or %NULL
|
|
||||||
*/
|
*/
|
||||||
ClutterColorState *
|
ClutterColorState *
|
||||||
clutter_actor_get_color_state (ClutterActor *self)
|
clutter_actor_get_color_state (ClutterActor *self)
|
||||||
{
|
{
|
||||||
|
ClutterActorPrivate *priv;
|
||||||
|
|
||||||
g_return_val_if_fail (CLUTTER_IS_ACTOR (self), NULL);
|
g_return_val_if_fail (CLUTTER_IS_ACTOR (self), NULL);
|
||||||
|
|
||||||
return self->priv->color_state;
|
priv = clutter_actor_get_instance_private (self);
|
||||||
|
|
||||||
|
return priv->color_state;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
Loading…
Reference in New Issue
Block a user