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

Deprecate ClutterGeometry

Browse Source 
It's a bad rectangle type, with caveats and gotchas. We have better
types, courtesy of Cairo, as well as our own (ClutterRect).

https://bugzilla.gnome.org/show_bug.cgi?id=682789
This commit is contained in:
Emmanuele Bassi 2013-03-26 22:16:55 +00:00
parent 1724536cda
commit 8c32637eea
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clutter/clutter-base-types.c
View File

@ -69,6 +69,8 @@ clutter_geometry_free (ClutterGeometry *geometry)
* Find the union of two rectangles represented as #ClutterGeometry. * Find the union of two rectangles represented as #ClutterGeometry.
* *
* Since: 1.4 * Since: 1.4
*
* Deprecated: 1.16: Use #ClutterRect and clutter_rect_union()
*/ */
void void
clutter_geometry_union (const ClutterGeometry *geometry_a, clutter_geometry_union (const ClutterGeometry *geometry_a,
@ -101,6 +103,8 @@ clutter_geometry_union (const ClutterGeometry *geometry_a,
* %FALSE. * %FALSE.
* *
* Since: 1.4 * Since: 1.4
*
* Deprecated: 1.16: Use #ClutterRect and clutter_rect_intersection()
*/ */
gboolean gboolean
clutter_geometry_intersects (const ClutterGeometry *geometry0, clutter_geometry_intersects (const ClutterGeometry *geometry0,

6
clutter/clutter-types.h
View File

@ -78,7 +78,7 @@ typedef struct _ClutterPathNode ClutterPathNode;
typedef struct _ClutterActorBox ClutterActorBox; typedef struct _ClutterActorBox ClutterActorBox;
typedef struct _ClutterColor ClutterColor; typedef struct _ClutterColor ClutterColor;
typedef struct _ClutterGeometry ClutterGeometry; typedef struct _ClutterGeometry ClutterGeometry; /* XXX:2.0 - remove */
typedef struct _ClutterKnot ClutterKnot; typedef struct _ClutterKnot ClutterKnot;
typedef struct _ClutterMargin ClutterMargin; typedef struct _ClutterMargin ClutterMargin;
typedef struct _ClutterPerspective ClutterPerspective; typedef struct _ClutterPerspective ClutterPerspective;
@ -540,6 +540,8 @@ void clutter_actor_box_set_size (ClutterActorBox *box,
* <warning>You should not use #ClutterGeometry, or operate on its fields * <warning>You should not use #ClutterGeometry, or operate on its fields
* directly; you should use #cairo_rectangle_int_t or #ClutterRect if you * directly; you should use #cairo_rectangle_int_t or #ClutterRect if you
* need a rectangle type, depending on the precision required.</warning> * need a rectangle type, depending on the precision required.</warning>
*
* Deprecated: 1.16
*/ */
struct _ClutterGeometry struct _ClutterGeometry
{ {
@ -552,9 +554,11 @@ struct _ClutterGeometry
GType clutter_geometry_get_type (void) G_GNUC_CONST; GType clutter_geometry_get_type (void) G_GNUC_CONST;
CLUTTER_DEPRECATED_IN_1_16
void clutter_geometry_union (const ClutterGeometry *geometry_a, void clutter_geometry_union (const ClutterGeometry *geometry_a,
const ClutterGeometry *geometry_b, const ClutterGeometry *geometry_b,
ClutterGeometry *result); ClutterGeometry *result);
CLUTTER_DEPRECATED_IN_1_16
gboolean clutter_geometry_intersects (const ClutterGeometry *geometry0, gboolean clutter_geometry_intersects (const ClutterGeometry *geometry0,
const ClutterGeometry *geometry1); const ClutterGeometry *geometry1);