brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cairo-texture: Clean up style

Browse Source
This commit is contained in:
Emmanuele Bassi 2010-06-16 12:53:02 +01:00
parent 859d1f0792
commit 72fa820dbd
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
clutter/clutter-cairo-texture.c
View File

@ -300,8 +300,7 @@ clutter_cairo_texture_surface_resize_internal (ClutterCairoTexture *cairo)
cairo, cairo,
clutter_cairo_texture_surface_destroy); clutter_cairo_texture_surface_destroy);
/* Create a blank Cogl texture /* Create a blank Cogl texture */
*/
cogl_texture = cogl_texture_new_from_data (priv->width, priv->height, cogl_texture = cogl_texture_new_from_data (priv->width, priv->height,
COGL_TEXTURE_NONE, COGL_TEXTURE_NONE,
CLUTTER_CAIRO_TEXTURE_PIXEL_FORMAT, CLUTTER_CAIRO_TEXTURE_PIXEL_FORMAT,
@ -321,8 +320,8 @@ clutter_cairo_texture_notify (GObject *object,
that if both the width and height properties are set using a that if both the width and height properties are set using a
single call to g_object_set then the surface will only be resized single call to g_object_set then the surface will only be resized
once because the notifications will be frozen in between */ once because the notifications will be frozen in between */
if (!strcmp ("surface-width", pspec->name) if (strcmp ("surface-width", pspec->name) == 0 ||
|| !strcmp ("surface-height", pspec->name)) strcmp ("surface-height", pspec->name) == 0)
{ {
ClutterCairoTexture *cairo = CLUTTER_CAIRO_TEXTURE (object); ClutterCairoTexture *cairo = CLUTTER_CAIRO_TEXTURE (object);
@ -368,6 +367,7 @@ clutter_cairo_texture_class_init (ClutterCairoTextureClass *klass)
{ {
GObjectClass *gobject_class = G_OBJECT_CLASS (klass); GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
ClutterActorClass *actor_class = CLUTTER_ACTOR_CLASS (klass); ClutterActorClass *actor_class = CLUTTER_ACTOR_CLASS (klass);
GParamSpec *pspec;
gobject_class->finalize = clutter_cairo_texture_finalize; gobject_class->finalize = clutter_cairo_texture_finalize;
gobject_class->set_property = clutter_cairo_texture_set_property; gobject_class->set_property = clutter_cairo_texture_set_property;
@ -389,14 +389,15 @@ clutter_cairo_texture_class_init (ClutterCairoTextureClass *klass)
* *
* Since: 1.0 * Since: 1.0
*/ */
pspec = g_param_spec_uint ("surface-width",
"Surface Width",
"The width of the Cairo surface",
0, G_MAXUINT,
0,
CLUTTER_PARAM_READWRITE);
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_SURFACE_WIDTH, PROP_SURFACE_WIDTH,
g_param_spec_uint ("surface-width", pspec);
"Surface-Width",
"Surface Width",
0, G_MAXUINT,
0,
CLUTTER_PARAM_READWRITE));
/** /**
* ClutterCairoTexture:surface-height: * ClutterCairoTexture:surface-height:
* *
@ -405,14 +406,15 @@ clutter_cairo_texture_class_init (ClutterCairoTextureClass *klass)
* *
* Since: 1.0 * Since: 1.0
*/ */
pspec = g_param_spec_uint ("surface-height",
"Surface-Height",
"The height of the Cairo surface",
0, G_MAXUINT,
0,
CLUTTER_PARAM_READWRITE);
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_SURFACE_HEIGHT, PROP_SURFACE_HEIGHT,
g_param_spec_uint ("surface-height", pspec);
"Surface-Height",
"Surface Height",
0, G_MAXUINT,
0,
CLUTTER_PARAM_READWRITE));
} }
static void static void