isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-21 23:50:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

clutter: Make clutter_contraint_update_preferred_size() public

Browse Source 
This is necessary for gobject-introspection to correctly pick up
the annotations for the corresponding vfunc.

https://gitlab.gnome.org/GNOME/mutter/merge_requests/1067
This commit is contained in:
Florian Müllner 2020-02-19 01:26:52 +01:00 committed by Georges Basile Stavracas Neto
parent 4f8e518d42
commit 35fe6a40ed
3 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
clutter/clutter/clutter-constraint-private.h
View File

@ -30,13 +30,6 @@ gboolean clutter_constraint_update_allocation (ClutterConstraint *constraint,
ClutterActor *actor, ClutterActor *actor,
ClutterActorBox *allocation); ClutterActorBox *allocation);
void clutter_constraint_update_preferred_size (ClutterConstraint *constraint,
ClutterActor *actor,
ClutterOrientation direction,
float for_size,
float *minimum_size,
float *natural_size);
G_END_DECLS G_END_DECLS
#endif /* __CLUTTER_CONSTRAINT_PRIVATE_H__ */ #endif /* __CLUTTER_CONSTRAINT_PRIVATE_H__ */

11
clutter/clutter/clutter-constraint.c
View File

@ -222,6 +222,17 @@ clutter_constraint_update_allocation (ClutterConstraint *constraint,
return !clutter_actor_box_equal (allocation, &old_alloc); return !clutter_actor_box_equal (allocation, &old_alloc);
} }
/**
* clutter_constraint_update_preferred_size:
* @constraint: a #ClutterConstraint
* @actor: a #ClutterActor
* @direction: a #ClutterOrientation
* @for_size: the size in the opposite direction
* @minimum_size: (inout): the minimum size to modify
* @natural_size: (inout): the natural size to modify
*
* Asks the @constraint to update the size request of a #ClutterActor.
*/
void void
clutter_constraint_update_preferred_size (ClutterConstraint *constraint, clutter_constraint_update_preferred_size (ClutterConstraint *constraint,
ClutterActor *actor, ClutterActor *actor,

8
clutter/clutter/clutter-constraint.h
View File

@ -99,6 +99,14 @@ struct _ClutterConstraintClass
CLUTTER_EXPORT CLUTTER_EXPORT
GType clutter_constraint_get_type (void) G_GNUC_CONST; GType clutter_constraint_get_type (void) G_GNUC_CONST;
CLUTTER_EXPORT
void clutter_constraint_update_preferred_size (ClutterConstraint *constraint,
ClutterActor *actor,
ClutterOrientation direction,
float for_size,
float *minimum_size,
float *natural_size);
/* ClutterActor API */ /* ClutterActor API */
CLUTTER_EXPORT CLUTTER_EXPORT
void clutter_actor_add_constraint (ClutterActor *self, void clutter_actor_add_constraint (ClutterActor *self,